mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-09 07:28:43 +01:00
now only removes all gifs is policy is set
This commit is contained in:
parent
0a001801f9
commit
3b939f5158
@ -333,8 +333,11 @@
|
||||
$str = preg_replace('/{([^ \t\r\n}]+)}/', "<!-- Template $handle: Variable \\1 undefined -->", $str);
|
||||
break;
|
||||
}
|
||||
|
||||
$str = str_replace (".gif", ".png",$str);
|
||||
/* If they want NOGIF policy, then I do a global replace */
|
||||
if ($GLOBALS['phpgw_info']['server']['imgtype_preference'] == 2)
|
||||
{
|
||||
$str = str_replace (".gif", ".png",$str);
|
||||
}
|
||||
return $str;
|
||||
}
|
||||
|
||||
|
@ -776,16 +776,18 @@
|
||||
|
||||
function find_image($appname,$image)
|
||||
{
|
||||
|
||||
if (!isset($GLOBALS['phpgw_info']['server']['imgtype_preference_order']))
|
||||
switch($GLOBALS['phpgw_info']['server']['imgtype_preference'])
|
||||
{
|
||||
$imgpref = Array('gif','jpg','png');
|
||||
case 1:
|
||||
$imgpref = Array('gif','jpg','png');
|
||||
break;
|
||||
case 2:
|
||||
$imgpref = Array('png','jpg','nogifs');
|
||||
break;
|
||||
default:
|
||||
$imgpref = Array('png','jpg','gif');
|
||||
}
|
||||
else
|
||||
{
|
||||
$imgpref = $GLOBALS['phpgw_info']['server']['imgtype_preference_order'];
|
||||
}
|
||||
|
||||
|
||||
if (!@is_array($this->found_files[$appname]))
|
||||
{
|
||||
$imagedir_olddefault = '/'.$appname.'/images';
|
||||
|
Loading…
Reference in New Issue
Block a user