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

Fix issue processwire/processwire-issues#286

Browse Source
This commit is contained in:
Ryan Cramer
2017-06-22 07:03:28 -04:00
parent 571266c6c1
commit 3348f3f13a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wire/core/MarkupQA.php
View File

@@ -73,7 +73,10 @@ class MarkupQA extends Wire {
if($page) $this->setPage($page); if($page) $this->setPage($page);
if($field) $this->setField($field); if($field) $this->setField($field);
$this->assetsURL = $this->wire('config')->urls->assets; $this->assetsURL = $this->wire('config')->urls->assets;
$this->debug = (bool) $this->wire('config')->debugMarkupQA && $this->wire('user')->isSuperuser(); if($this->wire('config')->debugMarkupQA) {
$user = $this->wire('user');
if($user) $this->debug = $user->isSuperuser();
}
} }
/** /**
@@ -436,6 +439,10 @@ class MarkupQA extends Wire {
$langName = $this->debug && $language ? $language->name : ''; $langName = $this->debug && $language ? $language->name : '';
if($livePath) { if($livePath) {
if($path && substr($path, -1) != '/') {
// no trailing slash, retain the editors wishes here
$livePath = rtrim($livePath, '/');
}
if(strpos($livePath, '/trash/') !== false) { if(strpos($livePath, '/trash/') !== false) {
// linked page is in trash, we won't update it but we'll produce a warning // linked page is in trash, we won't update it but we'll produce a warning
$this->linkWarning("$path => $livePath (" . $this->_('it is in the trash') . ')'); $this->linkWarning("$path => $livePath (" . $this->_('it is in the trash') . ')');