From 22d20baba86628ffa01b7f78c70b95909bc79ac0 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 27 Jan 2017 10:20:25 -0800 Subject: [PATCH] Library config name consistency fix. --- e107_handlers/library_manager.php | 6 ++++-- e107_themes/bootstrap3/theme_library.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/e107_handlers/library_manager.php b/e107_handlers/library_manager.php index 3a7a076bd..bbc812bbd 100644 --- a/e107_handlers/library_manager.php +++ b/e107_handlers/library_manager.php @@ -1007,14 +1007,16 @@ class e_library_manager $siteTheme = e107::getPref('sitetheme'); $adminTheme = e107::getPref('admintheme'); + + foreach(array($siteTheme, $adminTheme) as $theme) { if(is_readable(e_THEME . $theme . '/theme_library.php')) // we don't use e_XXXX for themes. { e107_require_once(e_THEME . $theme . '/theme_library.php'); - $className = $theme . '_library'; - if(class_exists($className)) + $className = 'theme_library'; + if(class_exists($className)) //@todo replace with e107::callMethod(); { $addonClass = new $className(); diff --git a/e107_themes/bootstrap3/theme_library.php b/e107_themes/bootstrap3/theme_library.php index 00e2031eb..8e2575f69 100644 --- a/e107_themes/bootstrap3/theme_library.php +++ b/e107_themes/bootstrap3/theme_library.php @@ -15,7 +15,7 @@ /** * Class bootstrap3_library. */ -class bootstrap3_library +class theme_library { /**