mirror of
https://github.com/e107inc/e107.git
synced 2025-01-17 20:58:30 +01:00
Simplify plugin folder structure (shortcodes/ folder in plugin root), refactoring forums to meet the new structure.
This commit is contained in:
parent
34b40eddfb
commit
1d411f1715
@ -935,11 +935,11 @@ class e107
|
|||||||
* <code><?php
|
* <code><?php
|
||||||
* // core news shortcodes
|
* // core news shortcodes
|
||||||
* e107::getScObject('news');
|
* e107::getScObject('news');
|
||||||
* // object of plugin_myplugin_my_shortcodes class -> myplugin/core/shortcodes/batch/my_shortcodes.php
|
* // object of plugin_myplugin_my_shortcodes class -> myplugin/shortcodes/batch/my_shortcodes.php
|
||||||
* e107::getScObject('my', 'myplugin');
|
* e107::getScObject('my', 'myplugin');
|
||||||
* // news override - plugin_myplugin_news_shortcodes extends news_shortcodes -> myplugin/core/shortcodes/batch/news_shortcodes.php
|
* // news override - plugin_myplugin_news_shortcodes extends news_shortcodes -> myplugin/shortcodes/batch/news_shortcodes.php
|
||||||
* e107::getScObject('news', 'myplugin', true);
|
* e107::getScObject('news', 'myplugin', true);
|
||||||
* // news override - plugin_myplugin_mynews_shortcodes extends news_shortcodes -> myplugin/core/shortcodes/batch/mynews_shortcodes.php
|
* // news override - plugin_myplugin_mynews_shortcodes extends news_shortcodes -> myplugin/shortcodes/batch/mynews_shortcodes.php
|
||||||
* e107::getScObject('news', 'myplugin', 'mynews');
|
* e107::getScObject('news', 'myplugin', 'mynews');
|
||||||
* </code>
|
* </code>
|
||||||
*
|
*
|
||||||
@ -2818,7 +2818,7 @@ class e107
|
|||||||
// read the todo for e_shortcode.php related problems
|
// read the todo for e_shortcode.php related problems
|
||||||
if('shortcodes' == $end)
|
if('shortcodes' == $end)
|
||||||
{
|
{
|
||||||
$filename = e_PLUGIN.$tmp[0].'/core/shortcodes/batch/'; // plugname/core/shortcodes/batch/
|
$filename = e_PLUGIN.$tmp[0].'/shortcodes/batch/'; // plugname/shortcodes/batch/
|
||||||
unset($tmp[0]);
|
unset($tmp[0]);
|
||||||
$filename .= implode('_', $tmp).'_shortcodes.php'; // my_shortcodes.php
|
$filename .= implode('_', $tmp).'_shortcodes.php'; // my_shortcodes.php
|
||||||
break;
|
break;
|
||||||
|
@ -252,11 +252,11 @@ class e_parse_shortcode
|
|||||||
* // simple use
|
* // simple use
|
||||||
* e107::getScParser()->getScObject('news_shortcodes');
|
* e107::getScParser()->getScObject('news_shortcodes');
|
||||||
*
|
*
|
||||||
* // plugin override - e107_plugins/myplug/core/shortcodes/batch/news_shortcodes.php -> class plugin_myplug_news_shortcodes
|
* // plugin override - e107_plugins/myplug/shortcodes/batch/news_shortcodes.php -> class plugin_myplug_news_shortcodes
|
||||||
* e107::getScParser()->getScObject('news_shortcodes', 'myplug', true);
|
* e107::getScParser()->getScObject('news_shortcodes', 'myplug', true);
|
||||||
*
|
*
|
||||||
* // more complex plugin override
|
* // more complex plugin override
|
||||||
* // e107_plugins/myplug/core/shortcodes/batch/news2_shortcodes.php -> class plugin_myplug_news2_shortcodes
|
* // e107_plugins/myplug/shortcodes/batch/news2_shortcodes.php -> class plugin_myplug_news2_shortcodes
|
||||||
* e107::getScParser()->getScObject('news_shortcodes', 'myplug', 'news2_shortcodes');
|
* e107::getScParser()->getScObject('news_shortcodes', 'myplug', 'news2_shortcodes');
|
||||||
* </code>
|
* </code>
|
||||||
* @param string $className
|
* @param string $className
|
||||||
@ -289,7 +289,7 @@ class e_parse_shortcode
|
|||||||
return $this->scClasses[$className];
|
return $this->scClasses[$className];
|
||||||
}
|
}
|
||||||
|
|
||||||
$path = ($pluginName ? e_PLUGIN.$pluginName.'/core/shortcodes/batch/' : e_CORE.'shortcodes/batch/').$_class_fname.'.php';
|
$path = ($pluginName ? e_PLUGIN.$pluginName.'/shortcodes/batch/' : e_CORE.'shortcodes/batch/').$_class_fname.'.php';
|
||||||
if (is_readable($path))
|
if (is_readable($path))
|
||||||
{
|
{
|
||||||
require_once($path);
|
require_once($path);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user