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)
e107inc · Oct 2, 2019 · 18243e7 · 18243e7
1 parent e67cf48
commit 18243e7
Showing 1 changed file with 6 additions and 10 deletions.
diff --git 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;
-}
-
-
-
-
-?>
+}