mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Removed globals from meta-tag method in header.

Browse Source
This commit is contained in:
Cameron 2015-05-31 09:25:59 -07:00
parent a5f5264cf7
commit a7cc11f5ee
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
e107_core/templates/header_default.php
View File

@ -459,10 +459,15 @@ $key_merge = (defined("META_MERGE") && META_MERGE != FALSE && $pref['meta_keywor
function render_meta($type) function render_meta($type)
{ {
global $pref,$tp; $tp = e107::getParser();
$pref = e107::getPref();
if (!isset($pref['meta_'.$type][e_LANGUAGE]) || empty($pref['meta_'.$type][e_LANGUAGE])) $key = 'meta_'.$type;
{ $language = e_LANGUAGE;
if(empty($pref[$key][$language]))
{
// e107::getMessage()->addError("Couldn't find: pref - ".$key);
return ''; return '';
} }

18
e107_handlers/shortcode_handler.php
View File

@ -462,10 +462,20 @@ class e_parse_shortcode
// $this->registered_codes[$code]['type'] = 'plugin'; // $this->registered_codes[$code]['type'] = 'plugin';
// $this->registered_codes[$code]['function'] = strtolower($code).'_shortcode'; // $this->registered_codes[$code]['function'] = strtolower($code).'_shortcode';
// $this->registered_codes[$code]['path'] = e_PLUGIN.$path.'/shortcodes/single/'; // $this->registered_codes[$code]['path'] = e_PLUGIN.$path.'/shortcodes/single/';
// $this->registered_codes[$code]['perms'] = $uclass; // $this->registered_codes[$code]['perms'] = $uclass;
if(deftrue('e_DEVELOPER')) // experimental, could break something. - use theme shortcodes in other templates.
{
if(file_exists(THEME."theme_shortcodes.php"))
{
$classFunc = 'theme_shortcodes';
$path = THEME."theme_shortcodes.php";
include_once($path);
$this->registerClassMethods($classFunc, $path, false);
}
}
if (isset($register_sc) && is_array($register_sc)) if (isset($register_sc) && is_array($register_sc))
{ {