mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 22:57:14 +02:00
Code Issues Releases Wiki Activity

Allow for core shortcode class names other than default. Provides a work-around to possible conflicts between e_shortcode and {plugin}_shortcodes.php

Browse Source
This commit is contained in:
Cameron
2013-02-01 17:35:56 -08:00
parent ef131c1642
commit 2b05530a62
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e107_handlers/shortcode_handler.php
View File

@@ -262,6 +262,8 @@ class e_parse_shortcode
public function getScObject($className, $pluginName = null, $overrideClass = null)
{
if(trim($className)==""){ return; }
$_class_fname = $className;
@@ -273,8 +275,16 @@ class e_parse_shortcode
$overrideClass = $className;
}
// e.g. class plugin_myplug_news_shortcodes
$_class_fname = $overrideClass;
$className = 'plugin_'.$pluginName.'_'.str_replace('/', '_', $overrideClass);
if($pluginName != null)
{
$_class_fname = $overrideClass;
$className = 'plugin_'.$pluginName.'_'.str_replace('/', '_', $overrideClass);
}
else
{
$className = $overrideClass;
}
}
elseif(is_string($pluginName))
{
@@ -318,12 +328,13 @@ class e_parse_shortcode
}
elseif(E107_DBG_BBSC || E107_DBG_SC)
{
echo "Couldn't Find Class '".$className."' in <b>".$path."</b>";
echo "<h3>Couldn't Find Class '".$className."' in <b>".$path."</b></h3>";
}
}
elseif(E107_DBG_BBSC || E107_DBG_SC)
{
echo "Couldn't Load: <b>".$path."</b>";
echo "<h3>Couldn't Load: <b>".$path."</b></h3>";
}
// TODO - throw exception?