mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Handle override of core shortcodes by plugins better

Browse Source
This commit is contained in:
e107steved
2008-03-02 21:08:31 +00:00
parent c23e44d712
commit 26e80bb7c1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
e107_handlers/shortcode_handler.php
View File

@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/shortcode_handler.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/shortcode_handler.php,v $
| $Revision: 1.11 $ | $Revision: 1.12 $
| $Date: 2008-02-19 19:33:45 $ | $Date: 2008-03-02 21:08:31 $
| $Author: mcfly_e107 $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -142,17 +142,22 @@ class e_shortcode
} }
else else
{ {
$sc_perms = e_UC_PUBLIC; // Default permissions are 'everybody'
if ($this->parseSCFiles == TRUE) if ($this->parseSCFiles == TRUE)
{ {
if (is_array($this -> registered_codes) && array_key_exists($code, $this->registered_codes)) if (is_array($this -> registered_codes) && array_key_exists($code, $this->registered_codes))
{ {
if($this->registered_codes[$code]['type'] == 'plugin') if($this->registered_codes[$code]['type'] == 'plugin')
{ {
if (isset($this->registered_codes[$code]['perms'])) $sc_perms = $this->registered_codes[$code]['perms']; if (check_class($this->registered_codes[$code]['perms']))
{ // Use the plugin 'override' shortcode
$scFile = e_PLUGIN.strtolower($this->registered_codes[$code]['path']).'/'.strtolower($code).'.sc'; $scFile = e_PLUGIN.strtolower($this->registered_codes[$code]['path']).'/'.strtolower($code).'.sc';
} }
else else
{ // Look for a core shortcode
$scFile = e_FILE."shortcode/".strtolower($code).".sc";
}
}
else
{ {
$scFile = THEME.strtolower($code).'.sc'; $scFile = THEME.strtolower($code).'.sc';
} }
@@ -161,12 +166,7 @@ class e_shortcode
{ {
$scFile = e_FILE."shortcode/".strtolower($code).".sc"; $scFile = e_FILE."shortcode/".strtolower($code).".sc";
} }
if (!check_class($sc_perms)) if (file_exists($scFile))
{ // Mainly to pick up e_UC_NOBODY
$shortcode = 'return;';
$this->scList[$code] = 'return;';
}
elseif (file_exists($scFile))
{ {
$shortcode = file_get_contents($scFile); $shortcode = file_get_contents($scFile);
$this->scList[$code] = $shortcode; $this->scList[$code] = $shortcode;