mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 19:44:09 +02:00
Code Issues Releases Wiki Activity

Fixes #326, #331 and corrects markup issues with pull-request #390.

Browse Source 
Also added check for theme_shortcodes.php for including batches of theme shortcodes.
theme_config.php is now the correct file name for a theme config.
This commit is contained in:
Cameron
2013-06-19 22:50:51 -07:00
parent 29f74508c2
commit 2d21d0e7d2
7 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
e107_handlers/shortcode_handler.php
View File

@@ -335,7 +335,13 @@ class e_parse_shortcode
}
}
if(!$pluginName)
if($className == '_theme__shortcodes') // Check for theme shortcode batch. - @see header_default.php //XXX Discuss.
{
$className = 'theme_shortcodes';
$path = THEME.'theme_shortcodes.php';
}
elseif(!$pluginName)
{
if(!$globalOverride)
{
@@ -366,6 +372,10 @@ class e_parse_shortcode
$className = 'override_'.$className;
}
}
// Includes global Shortcode Classes (e_shortcode.php) or already loaded batch
if ($this->isScClass($className))
@@ -377,7 +387,7 @@ class e_parse_shortcode
if (class_exists($className, false)) // don't allow __autoload()
{
// $this->registerClassMethods($className, $path); // XXX Global registration should happen separately - here we want only the object.
$this->scClasses[$className] = new $className(); // located inside registerClassMethods()
$this->scClasses[$className] = new $className();
return $this->scClasses[$className];
}
@@ -387,7 +397,7 @@ 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->scClasses[$className] = new $className();
// $this->registerClassMethods($className, $path); // XXX Global registration should happen separately - here we want only the object.
return $this->scClasses[$className];
}
@@ -444,10 +454,18 @@ class e_parse_shortcode
*
* @return e_parse_shortcode
*/
public function loadThemeShortcodes()
protected function loadThemeShortcodes()
{
global $register_sc;
// $this->registered_codes[$code]['type'] = 'plugin';
// $this->registered_codes[$code]['function'] = strtolower($code).'_shortcode';
// $this->registered_codes[$code]['path'] = e_PLUGIN.$path.'/shortcodes/single/';
// $this->registered_codes[$code]['perms'] = $uclass;
if (isset($register_sc) && is_array($register_sc))
{
foreach ($register_sc as $code)
@@ -459,6 +477,7 @@ class e_parse_shortcode
}
}
}
return $this;
}

22
e107_handlers/theme_handler.php
View File

@@ -910,9 +910,27 @@ class themeHandler
function loadThemeConfig()
{
$mes = e107::getMessage();
$confile = e_THEME.$this->id."/".$this->id."_config.php";
if(($this->themeConfigObj === null) && is_readable($confile))
$newConfile = e_THEME.$this->id."/theme_config.php";
$legacyConfile = e_THEME.$this->id."/".$this->id."_config.php"; // @Deprecated
if(is_readable($newConfile))
{
$confile = $newConfile;
}
elseif(is_readable($legacyConfile))// TODO Eventually remove it.
{
// NOTE: this is debug info.. do not translate.
e107::getMessage()->addDebug("Deprecated Theme Config File found! Rename <b>".$this->id."_config.php.</b> to <b>theme_config.php</b> to correct this issue. .");
$confile = $legacyConfile;
}
else
{
return;
}
if(($this->themeConfigObj === null) )
{
$mes->addDebug("Loading : ".$confile);
include ($confile);