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

Fix issue processwire/processwire-issues#336 where markup regions run on SVG output caused problem

Browse Source
This commit is contained in:
Ryan Cramer
2017-08-16 10:18:40 -04:00
parent c496c3b859
commit 56345aff26
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wire/modules/PageRender.module
View File

@@ -517,9 +517,12 @@ class PageRender extends WireData implements Module, ConfigurableModule {
throw new WireException('Missing or non-readable template file: ' . basename($options['filename'])); throw new WireException('Missing or non-readable template file: ' . basename($options['filename']));
} }
} }
if($this->wire('config')->useMarkupRegions) { if($this->wire('config')->useMarkupRegions) {
$this->populateMarkupRegions($data); $contentType = $template->contentType;
if(empty($contentType) || stripos($contentType, 'html') !== false) {
$this->populateMarkupRegions($data);
}
} }
if($data && $cacheAllowed && $cacheFile) $cacheFile->save($data); if($data && $cacheAllowed && $cacheFile) $cacheFile->save($data);
@@ -541,7 +544,7 @@ class PageRender extends WireData implements Module, ConfigurableModule {
*/ */
protected function populateMarkupRegions(&$html) { protected function populateMarkupRegions(&$html) {
$pos = stripos($html, '<!DOCTYPE'); $pos = stripos($html, '<!DOCTYPE html');
if($pos === false) { if($pos === false) {
// if no doctype match, attempt an html tag match // if no doctype match, attempt an html tag match