mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Closes #3948 - Forum icons extra check added for consistency

Browse Source 
Forum icons can be placed in the THEME/forum/images/icons folder (same as with PLUGIN/forum/images/icons structure)
This commit is contained in:
Tijn Kuyper
2019-10-02 11:31:30 +02:00
parent e67cf48c84
commit 18243e7cdd
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_plugins/forum/forum_class.php
View File

@@ -2575,10 +2575,6 @@ class e107forum
} }
} }
@@ -2605,6 +2601,11 @@ function img_path($filename)
{ {
$image = ($ML && is_readable(THEME.'forum/'.e_LANGUAGE.'_'.$filename)) ? THEME_ABS.'forum/'.e_LANGUAGE."_".$filename : THEME_ABS.'forum/'.$filename; $image = ($ML && is_readable(THEME.'forum/'.e_LANGUAGE.'_'.$filename)) ? THEME_ABS.'forum/'.e_LANGUAGE."_".$filename : THEME_ABS.'forum/'.$filename;
} }
// #3948 - added for consistency with plugin folder structure. Also check THEME/forum/images/icons/ folder
elseif(file_exists(THEME.'forum/images/icons/'.$filename) || is_readable(THEME.'forum/images/icons/'.e_LANGUAGE.'_'.$filename))
{
$image = ($ML && is_readable(THEME.'forum/images/icons/'.e_LANGUAGE.'_'.$filename)) ? THEME_ABS.'forum/images/icons/'.e_LANGUAGE."_".$filename : THEME_ABS.'forum/images/icons/'.$filename;
}
else else
{ {
if(defined('IMODE')) if(defined('IMODE'))
@@ -2633,9 +2634,4 @@ function img_path($filename)
} }
return $image; return $image;
} }
?>