jenkins-bot has submitted this change and it was merged.

Change subject: Reapply "Constrain redirects to Wikipedia Zero partner-sourced 
requests."
......................................................................


Reapply "Constrain redirects to Wikipedia Zero partner-sourced requests."

This reverts commit 28bcaf3b592b8e3fa907dc1f4932df76be8f47f4.

Change-Id: Icf333cbd75b43711b866fa18c0eed2ae57d4dffa
---
M includes/PageRenderingHooks.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index 4044539..731d745 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -145,7 +145,7 @@
 
                $acceptBilling = $wgRequest->getVal( 'acceptbilling' );
                // @BUG: weird code, need to check what was originally intended
-               if ( $acceptBilling === 'no' || $acceptBilling === 'yes' ) {
+               if ( $config !== null && ( $acceptBilling === 'no' || 
$acceptBilling === 'yes' ) ) {
                        $targetUrl = $wgRequest->getVal( 'returnto' );
                        if ( $targetUrl ) {
                                $out->redirect( $targetUrl, '301' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf333cbd75b43711b866fa18c0eed2ae57d4dffa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <[email protected]>
Gerrit-Reviewer: Dr0ptp4kt <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to