From f5b04aa513165af0923c0230ec3589a8f6a46208 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Fri, 24 Oct 2008 11:04:27 +0000 Subject: [PATCH] fixing a bug related to the saving of an resource, with an own picture already attached --- resources/inc/class.bo_resources.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/inc/class.bo_resources.inc.php b/resources/inc/class.bo_resources.inc.php index d34ce593ed..ef24e9386a 100755 --- a/resources/inc/class.bo_resources.inc.php +++ b/resources/inc/class.bo_resources.inc.php @@ -177,7 +177,7 @@ class bo_resources $msg = $this->save_picture($resource['own_file'],$resource['res_id']); 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; } @@ -538,6 +538,7 @@ class bo_resources { $src = $this->so->get_value('picture_src',$res_id); } +#echo $scr."
". $this->pictures_dir."
"; switch($src) { case 'own_src': @@ -550,6 +551,8 @@ class bo_resources { $picture = egw::link('/etemplate/thumbnail.php',array('path' => $picture)); } + //$picture=$GLOBALS['egw_info']['server'].$picture; +#echo $picture."
"; break; case 'cat_src': list($picture) = $this->cats->return_single($this->so->get_value('cat_id',$res_id));