mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-19 13:01:26 +02:00
Code Issues Releases Wiki Activity

Fix for debug mode warning in WireMarkupRegions plus other minor tweaks

Browse Source
This commit is contained in:
Ryan Cramer
2017-01-29 07:08:18 -05:00
parent 933d9de724
commit 1886f132b5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wire/core/WireMarkupRegions.php
View File

@@ -1140,8 +1140,10 @@ class WireMarkupRegions extends Wire {
static $recursionLevel = 0; static $recursionLevel = 0;
$recursionLevel++; $recursionLevel++;
$leftoverMarkup = ''; $leftoverMarkup = '';
$debugLandmark = "<!--PW-REGION-DEBUG-->"; $debugLandmark = "<!--PW-REGION-DEBUG-->";
$debug = $this->wire('config')->debug || strpos($htmlDocument, $debugLandmark) !== false; $hasDebugLandmark = strpos($htmlDocument, $debugLandmark) !== false;
$debug = $hasDebugLandmark && $this->wire('config')->debug;
$debugTimer = $debug ? Debug::timer() : 0; $debugTimer = $debug ? Debug::timer() : 0;
if(is_array($htmlRegions)) { if(is_array($htmlRegions)) {
@@ -1211,7 +1213,9 @@ class WireMarkupRegions extends Wire {
($region['actionTarget'] != $pwid ? "(target=$region[actionTarget])" : "") . ($region['actionTarget'] != $pwid ? "(target=$region[actionTarget])" : "") .
"... $open" . ($region['close'] ? "[small]$debugBytes bytes[/small]$region[close]" : ""); "... $open" . ($region['close'] ? "[small]$debugBytes bytes[/small]$region[close]" : "");
$regionNote = "$regionKey. $region[note]"; $regionNote = "$regionKey. $region[note]";
} } else {
$regionNote = '';
}
if(!$documentHasTarget) { if(!$documentHasTarget) {
// if the id attribute doesn't appear in the html, skip it // if the id attribute doesn't appear in the html, skip it
@@ -1263,6 +1267,8 @@ class WireMarkupRegions extends Wire {
} else { } else {
$htmlDocument .= "<!--" . $debugNotes . "\n-->"; $htmlDocument .= "<!--" . $debugNotes . "\n-->";
} }
} else if($hasDebugLandmark) {
$htmlDocument = str_replace($debugLandmark, '', $htmlDocument);
} }
if(count($xregions) && $recursionLevel < 3) { if(count($xregions) && $recursionLevel < 3) {