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

Fix for plugin repair (in debug mode) Fix for Login page signup link when registration is disabled.

Browse Source
This commit is contained in:
Cameron
2016-04-30 12:02:02 -07:00
parent d3383a71b6
commit d098589456
5 changed files with 69 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_handlers/shortcode_handler.php
View File

@@ -838,14 +838,16 @@ class e_parse_shortcode
// XXX remove all globals, $sc_style removed
global $pref, $e107cache, $menu_pref, $parm, $sql;
$parmArray = false;
$fullShortcodeKey = null;
$parmArray = false;
$fullShortcodeKey = null;
$noDebugLog = false;
if ($this->eVars)
{
if ($this->eVars->isVar($matches[1]))
{
$match1 = $matches[1]; // php7 fix.
// e107::getDebug()->log("Using eVars ".$match1);
return $this->eVars->$match1;
}
}
@@ -923,6 +925,7 @@ class e_parse_shortcode
{
$debugArr = array('class_original'=>get_class($this->addedCodes), 'class_override'=>$this->addonOverride[$_method], 'function'=>$_method);
e107::getDebug()->logCode(4, $code, null, print_a($debugArr,true));
$noDebugLog = true;
}
@@ -1201,7 +1204,7 @@ class e_parse_shortcode
$sql->db_Mark_Time("(After SC {$code})");
}
if (E107_DBG_BBSC || E107_DBG_SC || E107_DBG_TIMEDETAILS)
if (($noDebugLog != true) && (E107_DBG_BBSC || E107_DBG_SC || E107_DBG_TIMEDETAILS))
{
global $db_debug;