From 86ee4417339db6d068ab5ff4709adfa6772afea7 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 6 Jun 2006 05:33:33 +0000 Subject: [PATCH] Fixed bug introduced with the fix for the "no images" bug, thanks to John Thomas for letting me know --- phpgwapi/inc/class.html.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php index 25002fe178..74ea31f2a9 100644 --- a/phpgwapi/inc/class.html.inc.php +++ b/phpgwapi/inc/class.html.inc.php @@ -879,13 +879,14 @@ class html if($GLOBALS['egw_info']['server']['webserver_url']) { list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'],$url); - $path = EGW_SERVER_ROOT.$path; + + if (!is_null($path)) $path = EGW_SERVER_ROOT.$path; } else { $path = EGW_SERVER_ROOT.$url; } - if (!@is_readable($path)) + if (is_null($path) || !@is_readable($path)) { // if the image-name is a percentage, use a progressbar if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))