mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 23:56:58 +02:00
Code Issues Releases Wiki Activity

Correction of shortcode global issue. As per e107 v1.x - shortcodes should only ever be registered globally using e_shortcode.php or xxx.sc files.

Browse Source
This commit is contained in:
Cameron
2013-05-31 18:40:56 -07:00
parent 8d94fa8b23
commit b8cdc71795
8 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/shortcode_handler.php
View File

@@ -376,7 +376,8 @@ class e_parse_shortcode
// If it already exists - don't include it again.
if (class_exists($className, false)) // don't allow __autoload()
{
$this->registerClassMethods($className, $path);
// $this->registerClassMethods($className, $path); // XXX Global registration should happen separately - here we want only the object.
$this->scClasses[$className] = new $className(); // located inside registerClassMethods()
return $this->scClasses[$className];
}
@@ -386,8 +387,8 @@ class e_parse_shortcode
if (class_exists($className, false)) // don't allow __autoload()
{
// register instance directly to allow override
// $this->scClasses[$className] = new $className(); // located inside registerClassMethods()
$this->registerClassMethods($className, $path);
$this->scClasses[$className] = new $className(); // located inside registerClassMethods()
// $this->registerClassMethods($className, $path);
return $this->scClasses[$className];
}
elseif(E107_DBG_BBSC || E107_DBG_SC)