Yurik has submitted this change and it was merged.
Change subject: Revert "(Bug 48528) TEMPORARY: Log lots of info to catch a bug"
......................................................................
Revert "(Bug 48528) TEMPORARY: Log lots of info to catch a bug"
This reverts commit 71aa24b397ea61642f2512def35ca74e35856ba2
Change-Id: I55c37b690d4e48428404d22565e09648304adec6
---
M includes/PageRenderingHooks.php
1 file changed, 1 insertion(+), 21 deletions(-)
Approvals:
Yurik: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/PageRenderingHooks.php b/includes/PageRenderingHooks.php
index fd24e78..c2aef24 100644
--- a/includes/PageRenderingHooks.php
+++ b/includes/PageRenderingHooks.php
@@ -21,7 +21,7 @@
class PageRenderingHooks {
private static $formatMobileUrl = '//%s.m.wikipedia.org/wiki/Main_Page';
private static $formatZeroUrl =
'//%s.zero.wikipedia.org/wiki/Main_Page';
- private static $carrierId;
+
/**
* GetMobileUrl hook handler
@@ -368,25 +368,6 @@
global $wgLang;
$lang = $wgLang;
}
-
-
-
- // BUG HUNTING!
- if ( !$config['name'] || !$config['banner'] ) {
- global $wgRequest;
- $dbg = 'Zero bug, ID="' . self::$carrierId . '"-
missing';
- if ( !$config['name'] ) $dbg .= ' name';
- if ( !$config['banner'] ) $dbg .= ' banner';
- $dbg .= ': ';
- $dbg .= print_r( $config, true );
- $dbg .= "\nIP:" . $wgRequest->getIP() . ", URL: " .
$_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];
- $dbg .= "\nHeaders: " . print_r(
$wgRequest->getAllHeaders(), true );
- wfDebugLog( 'temp-debug', $dbg );
- }
-
-
-
-
$fallbacks = null;
$name = self::pickLocalizedString( $config['name'], $lang,
$fallbacks );
if ( $name === false ) {
@@ -459,7 +440,6 @@
if ( $id === '(null)' || !$id ) {
$id = null;
}
- self::$carrierId = $id;
if ( $id !== null ) {
$store = new CarrierConfigStore( $id );
$text = $store->get();
--
To view, visit https://gerrit.wikimedia.org/r/64030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I55c37b690d4e48428404d22565e09648304adec6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Yurik <[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
