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

Fix issue processwire/processwire-issues#302 where markup <region> tags didn't get removed if template file produced no output

Browse Source
This commit is contained in:
Ryan Cramer
2018-02-26 09:58:29 -05:00
parent 9d2a986048
commit ac779c79a8
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wire/core/WireMarkupRegions.php
View File

@@ -1315,6 +1315,7 @@ class WireMarkupRegions extends Wire {
if(!count($regions)) { if(!count($regions)) {
if($debug) $htmlDocument = str_replace($debugLandmark, "<pre>No regions</pre>$debugLandmark", $htmlDocument); if($debug) $htmlDocument = str_replace($debugLandmark, "<pre>No regions</pre>$debugLandmark", $htmlDocument);
$recursionLevel--; $recursionLevel--;
if(!$recursionLevel) $this->removeRegionTags($htmlDocument);
return 0; return 0;
} }
@@ -1480,7 +1481,7 @@ class WireMarkupRegions extends Wire {
* @return bool True if tags or attributes were removed, false if not * @return bool True if tags or attributes were removed, false if not
* *
*/ */
protected function removeRegionTags(&$html) { public function removeRegionTags(&$html) {
$updated = false; $updated = false;

12
wire/modules/PageRender.module
View File

@@ -544,6 +544,9 @@ class PageRender extends WireData implements Module, ConfigurableModule {
*/ */
protected function populateMarkupRegions(&$html) { protected function populateMarkupRegions(&$html) {
$markupRegions = new WireMarkupRegions();
$this->wire($markupRegions);
$pos = stripos($html, '<!DOCTYPE html'); $pos = stripos($html, '<!DOCTYPE html');
if($pos === false) { if($pos === false) {
@@ -552,14 +555,15 @@ class PageRender extends WireData implements Module, ConfigurableModule {
} }
// if no document start, or document starts at pos==0, then nothing to populate // if no document start, or document starts at pos==0, then nothing to populate
if(!$pos) return; if(!$pos) {
// there still may be region related stuff that needs to be removed like <region> tags
$markupRegions->removeRegionTags($html);
return;
}
// split document at doctype/html boundary // split document at doctype/html boundary
$htmlBefore = substr($html, 0, $pos); $htmlBefore = substr($html, 0, $pos);
$html = substr($html, $pos); $html = substr($html, $pos);
$markupRegions = new WireMarkupRegions();
$this->wire($markupRegions);
$options = array('useClassActions' => true); $options = array('useClassActions' => true);
$config = $this->wire('config'); $config = $this->wire('config');
$version = (int) $config->useMarkupRegions; $version = (int) $config->useMarkupRegions;