forked from extern/egroupware
fixing a bug related to the saving of an resource, with an own picture already attached
This commit is contained in:
parent
deb6edda9b
commit
f5b04aa513
@ -177,7 +177,7 @@ class bo_resources
|
|||||||
$msg = $this->save_picture($resource['own_file'],$resource['res_id']);
|
$msg = $this->save_picture($resource['own_file'],$resource['res_id']);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif(@egw_vfs::stat($this->pictures_dir.$resource['res_id'].'.jpg'))
|
elseif(@egw_vfs::stat('/apps/resources/'.$resource['res_id'].'/'.self::PICTURE_NAME))
|
||||||
{
|
{
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -538,6 +538,7 @@ class bo_resources
|
|||||||
{
|
{
|
||||||
$src = $this->so->get_value('picture_src',$res_id);
|
$src = $this->so->get_value('picture_src',$res_id);
|
||||||
}
|
}
|
||||||
|
#echo $scr."<br>". $this->pictures_dir."<br>";
|
||||||
switch($src)
|
switch($src)
|
||||||
{
|
{
|
||||||
case 'own_src':
|
case 'own_src':
|
||||||
@ -550,6 +551,8 @@ class bo_resources
|
|||||||
{
|
{
|
||||||
$picture = egw::link('/etemplate/thumbnail.php',array('path' => $picture));
|
$picture = egw::link('/etemplate/thumbnail.php',array('path' => $picture));
|
||||||
}
|
}
|
||||||
|
//$picture=$GLOBALS['egw_info']['server'].$picture;
|
||||||
|
#echo $picture."<br>";
|
||||||
break;
|
break;
|
||||||
case 'cat_src':
|
case 'cat_src':
|
||||||
list($picture) = $this->cats->return_single($this->so->get_value('cat_id',$res_id));
|
list($picture) = $this->cats->return_single($this->so->get_value('cat_id',$res_id));
|
||||||
|
Loading…
Reference in New Issue
Block a user