mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

More shortcode/parser BC (global) fixes.

Browse Source
This commit is contained in:
Cameron
2013-05-31 18:52:46 -07:00
parent b8cdc71795
commit 27e98076f0
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/admin.php
View File

@@ -232,8 +232,8 @@ class admin_start
// auto db update // auto db update
if ('0' == ADMINPERMS) if ('0' == ADMINPERMS)
{ {
e107::getScBatch('admin'); $sc = e107::getScBatch('admin');
echo $tp->parseTemplate('{ADMIN_COREUPDATE=alert}',true); echo $tp->parseTemplate('{ADMIN_COREUPDATE=alert}',true, $sc);
require_once(e_ADMIN.'update_routines.php'); require_once(e_ADMIN.'update_routines.php');
update_check(); update_check();

4
e107_admin/boot.php
View File

@@ -349,7 +349,7 @@ if (!function_exists("parse_admin"))
{ {
function parse_admin($ADMINLAYOUT) function parse_admin($ADMINLAYOUT)
{ {
e107::getScBatch('admin'); $sc = e107::getScBatch('admin');
$tp = e107::getParser(); $tp = e107::getParser();
$adtmp = explode("\n", $ADMINLAYOUT); $adtmp = explode("\n", $ADMINLAYOUT);
@@ -357,7 +357,7 @@ if (!function_exists("parse_admin"))
{ {
if (preg_match("/{.+?}/", $adtmp[$a])) if (preg_match("/{.+?}/", $adtmp[$a]))
{ {
echo $tp->parseTemplate($adtmp[$a]); echo $tp->parseTemplate($adtmp[$a], true, $sc);
} }
else else
{ {

2
e107_handlers/bbcode_handler.php
View File

@@ -536,7 +536,7 @@ class e_bbcode
$bbcode_shortcodes->setVars($data); $bbcode_shortcodes->setVars($data);
return "<div id='bbcode-panel-".$id."' class='mceToolbar bbcode-panel' {$visible}>".$tp->parseTemplate($BBCODE_TEMPLATE,TRUE)."</div>"; return "<div id='bbcode-panel-".$id."' class='mceToolbar bbcode-panel' {$visible}>".$tp->parseTemplate($BBCODE_TEMPLATE,TRUE, $bbcode_shortcodes)."</div>";
} }

6
login.php
View File

@@ -101,7 +101,7 @@ if (!USER || getperms('0'))
} }
$text = $tp->parseTemplate($LOGIN_TABLE,true); $text = $tp->parseTemplate($LOGIN_TABLE,true, $sc);
@@ -115,9 +115,9 @@ if (!USER || getperms('0'))
// echo preg_replace("/\{(.*?)\}/e", 'varset($\1,"\1")', $LOGIN_TABLE_HEADER); // echo preg_replace("/\{(.*?)\}/e", 'varset($\1,"\1")', $LOGIN_TABLE_HEADER);
$login_message = SITENAME; // $login_message = LAN_LOGIN_3." | ".SITENAME; $login_message = SITENAME; // $login_message = LAN_LOGIN_3." | ".SITENAME;
echo LOGINMESSAGE; echo LOGINMESSAGE;
echo $tp->parseTemplate($LOGIN_TABLE_HEADER); echo $tp->parseTemplate($LOGIN_TABLE_HEADER, $sc);
$ns->tablerender($login_message, $text, 'login_page'); $ns->tablerender($login_message, $text, 'login_page');
echo $tp->parseTemplate($LOGIN_TABLE_FOOTER); echo $tp->parseTemplate($LOGIN_TABLE_FOOTER, $sc);
// echo preg_replace("/\{([^ ]*?)\}/e", 'varset($\1,"\1")', $LOGIN_TABLE_FOOTER); // echo preg_replace("/\{([^ ]*?)\}/e", 'varset($\1,"\1")', $LOGIN_TABLE_FOOTER);