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

Fix for new Library config name consistency. Prevent loading Bootstrap default CSS on admin ui.

Browse Source
This commit is contained in:
Lóna Lore
2017-01-27 23:56:51 +01:00
parent ca91e6ed68
commit 3890970d53
1 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
e107_handlers/library_manager.php
View File

@@ -666,15 +666,30 @@ class e_library_manager
elseif(varset($library['theme'], false)) elseif(varset($library['theme'], false))
{ {
// e107::getAddon() does not support theme folders. // e107::getAddon() does not support theme folders.
if(is_readable(e_THEME . $library['theme'] . '/theme_library.php'))
{
e107_require_once(e_THEME . $library['theme'] . '/theme_library.php'); e107_require_once(e_THEME . $library['theme'] . '/theme_library.php');
$addonClass = $library['theme'] . '_library'; $addonClass = 'theme_library';
if(isset($addonClass) && class_exists($addonClass)) if(class_exists($addonClass))
{ {
$class = new $addonClass(); $class = new $addonClass();
} }
} }
// e107::getAddon() does not support theme folders.
if(is_readable(e_THEME . $library['theme'] . '/admin_theme_library.php'))
{
e107_require_once(e_THEME . $library['theme'] . '/admin_theme_library.php');
$addonClass = 'admin_theme_library';
if(class_exists($addonClass))
{
$class = new $addonClass();
}
}
}
// We support both a single parameter, which is an associative array, and an // We support both a single parameter, which is an associative array, and an
// indexed array of multiple parameters. // indexed array of multiple parameters.
if(isset($library['version_arguments'][0])) if(isset($library['version_arguments'][0]))
@@ -754,15 +769,30 @@ class e_library_manager
elseif(varset($library['theme'], false)) elseif(varset($library['theme'], false))
{ {
// e107::getAddon() does not support theme folders. // e107::getAddon() does not support theme folders.
if(is_readable(e_THEME . $library['theme'] . '/theme_library.php'))
{
e107_require_once(e_THEME . $library['theme'] . '/theme_library.php'); e107_require_once(e_THEME . $library['theme'] . '/theme_library.php');
$addonClass = $library['theme'] . '_library'; $addonClass = 'theme_library';
if(isset($addonClass) && class_exists($addonClass)) if(class_exists($addonClass))
{ {
$class = new $addonClass(); $class = new $addonClass();
} }
} }
// e107::getAddon() does not support theme folders.
if(is_readable(e_THEME . $library['theme'] . '/admin_theme_library.php'))
{
e107_require_once(e_THEME . $library['theme'] . '/admin_theme_library.php');
$addonClass = 'admin_theme_library';
if(class_exists($addonClass))
{
$class = new $addonClass();
}
}
}
// We support both a single parameter, which is an associative array, and an indexed array of // We support both a single parameter, which is an associative array, and an indexed array of
// multiple parameters. // multiple parameters.
if(isset($variant['variant_arguments'][0])) if(isset($variant['variant_arguments'][0]))
@@ -1716,11 +1746,20 @@ class e_library_manager
// Force to use default (original) files on Admin UI. // Force to use default (original) files on Admin UI.
case 'cdn.jquery.ui': case 'cdn.jquery.ui':
case 'jquery.ui': case 'jquery.ui':
$coreLib = $coreLibs[$library['machine_name']];
$library['files'] = $coreLib['files'];
$library['variants'] = $coreLib['variants'];
break;
case 'cdn.bootstrap': case 'cdn.bootstrap':
case 'bootstrap': case 'bootstrap':
$coreLib = $coreLibs[$library['machine_name']]; $coreLib = $coreLibs[$library['machine_name']];
$library['files'] = $coreLib['files']; $library['files'] = $coreLib['files'];
$library['variants'] = $coreLib['variants']; $library['variants'] = $coreLib['variants'];
// Admin UI uses its own CSS.
unset($library['files']['css']);
unset($library['variants']['dev']['files']['css']);
break; break;
} }
} }