From 18243e7cdd3e3ddb7597963e97f70b991d35ed0f Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Wed, 2 Oct 2019 11:31:30 +0200 Subject: [PATCH] Closes #3948 - Forum icons extra check added for consistency Forum icons can be placed in the THEME/forum/images/icons folder (same as with PLUGIN/forum/images/icons structure) --- e107_plugins/forum/forum_class.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php index 6cae1efe76..70a48f6ada 100644 --- a/e107_plugins/forum/forum_class.php +++ b/e107_plugins/forum/forum_class.php @@ -2575,10 +2575,6 @@ public function upgradeLegacyPrefs() } - - - - } @@ -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; } + // #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 { if(defined('IMODE')) @@ -2633,9 +2634,4 @@ function img_path($filename) } return $image; -} - - - - -?> \ No newline at end of file +} \ No newline at end of file