forked from extern/egroupware
Fixed bug introduced with the fix for the "no images" bug, thanks to John Thomas for letting me know
This commit is contained in:
parent
4df8986066
commit
86ee441733
@ -879,13 +879,14 @@ class html
|
|||||||
if($GLOBALS['egw_info']['server']['webserver_url'])
|
if($GLOBALS['egw_info']['server']['webserver_url'])
|
||||||
{
|
{
|
||||||
list(,$path) = explode($GLOBALS['egw_info']['server']['webserver_url'],$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
|
else
|
||||||
{
|
{
|
||||||
$path = EGW_SERVER_ROOT.$url;
|
$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 the image-name is a percentage, use a progressbar
|
||||||
if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))
|
if (substr($name,-1) == '%' && is_numeric($percent = substr($name,0,-1)))
|
||||||
|
Loading…
Reference in New Issue
Block a user