Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/84497


Change subject: bug 54212 - Zero URLs are leaking in non-zero mobile sites
......................................................................

bug 54212 - Zero URLs are leaking in non-zero mobile sites

Added a check for zero configuration to avoid DOM rewriting
when Zero is not detected.

Change-Id: I8d91357f08734e97b2c5cedd24970a75b4ab005a
---
M includes/PageRenderingHooks.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess 
refs/changes/97/84497/1

diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index f1cae1c..fec2efc 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -61,14 +61,17 @@
                        return true;
                }
 
+               $config = self::getConfig();
+               if ( $config === null ) {
+                       return true;
+               }
+
                global $wgRequest;
 
                wfProfileIn( __METHOD__ );
                $isFilePage = $context->getTitle()->inNamespace( NS_FILE );
-
                $doc = $formatter->getDoc();
                $xpath = new DOMXpath( $doc );
-               $config = self::getConfig();
 
                if ( !$isFilePage && self::disableImages() ) {
                        $tagToReplaceNodes = $doc->getElementsByTagName( 'img' 
);

-- 
To view, visit https://gerrit.wikimedia.org/r/84497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d91357f08734e97b2c5cedd24970a75b4ab005a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to