mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2811 from lonalore/library

Browse Source 
Fix for issue #2810
This commit is contained in:
Cameron
2017-10-10 13:10:04 -07:00
committed by GitHub
parent cc56b7296b 20d5905318
commit 857c894a62
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
e107_handlers/library_manager.php Normal file → Executable file
View File

@@ -957,7 +957,8 @@ class e_library_manager
if(!isset($loaded[$name])) if(!isset($loaded[$name]))
{ {
$cache = e107::getCache(); $cache = e107::getCache();
$cacheID = 'Library_' . e107::getParser()->filter($name, 'file'); $cache_context = (defset('e_ADMIN_AREA', false) == true) ? 'AdminArea' : 'UserArea';
$cacheID = 'Library_' . $cache_context . '_' . e107::getParser()->filter($name, 'file');
$cached = $cache->retrieve($cacheID, false, true, true); $cached = $cache->retrieve($cacheID, false, true, true);
if($cached) if($cached)
@@ -1288,7 +1289,7 @@ class e_library_manager
$library['callbacks'] += array( $library['callbacks'] += array(
'info' => array(), 'info' => array(),
'pre_detect' => array(), 'pre_detect' => array('preDetect'),
'post_detect' => array(), 'post_detect' => array(),
'pre_dependencies_load' => array(), 'pre_dependencies_load' => array(),
'pre_load' => array('preLoad'), 'pre_load' => array('preLoad'),
@@ -1848,32 +1849,37 @@ class e_library_manager
} }
/** /**
* Alter library information before loading. * Alters library information before detecting.
*/ */
private function preLoad(&$library) private function preDetect(&$library)
{ {
if(empty($library['machine_name'])) if(empty($library['machine_name']))
{ {
return; return;
} }
// Prevent plugins/themes from altering libraries on Admin UI.
if(defset('e_ADMIN_AREA', false) == true) if(defset('e_ADMIN_AREA', false) == true)
{ {
$coreLibrary = new core_library(); $coreLibrary = new core_library();
$coreLibs = $coreLibrary->config(); $coreLibs = $coreLibrary->config();
$coreLib = $coreLibs[$library['machine_name']];
switch($library['machine_name']) if (isset($coreLibs[$library['machine_name']])) {
{ $coreLib = $coreLibs[$library['machine_name']];
// Prevent plugins/themes from altering libraries on Admin UI. $library = array_replace_recursive($coreLib, array_replace_recursive($library, $coreLib));
case 'cdn.jquery.ui':
case 'jquery.ui':
case 'cdn.bootstrap':
case 'bootstrap':
$library = $coreLib;
break;
} }
} }
}
/**
* Alters library information before loading.
*/
private function preLoad(&$library)
{
if(empty($library['machine_name']))
{
return;
}
$excluded = $this->getExcludedLibraries(); $excluded = $this->getExcludedLibraries();