Awight has uploaded a new change for review.

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

Change subject: Deprecate old GeoIP HEAD thing
......................................................................

Deprecate old GeoIP HEAD thing

Change-Id: Ice057bd338f304a61db2a841b6d1733b64584a4e
---
M CentralNotice.hooks.php
M CentralNotice.php
2 files changed, 1 insertion(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice 
refs/changes/05/176705/1

diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php
index 558a9dd..55cd063 100644
--- a/CentralNotice.hooks.php
+++ b/CentralNotice.hooks.php
@@ -202,12 +202,7 @@
  * @return bool
  */
 function efCentralNoticeLoader( $out, $skin ) {
-       global $wgCentralHost, $wgCentralGeoScriptURL, $wgServer;
-
-       // Insert the geoIP lookup
-       if ( is_string( $wgCentralGeoScriptURL ) ) {
-               $out->addHeadItem( 'geoip', '<script src="' . htmlspecialchars( 
$wgCentralGeoScriptURL ) . '"></script>' );
-       }
+       global $wgCentralHost, $wgServer;
 
        // Insert DNS prefetch for banner loading
        if ( $wgCentralHost && $wgCentralHost !== $wgServer ) {
diff --git a/CentralNotice.php b/CentralNotice.php
index 2d29173..769266c 100644
--- a/CentralNotice.php
+++ b/CentralNotice.php
@@ -77,10 +77,6 @@
 // when on a different subdomain than the wiki.
 $wgCentralHost = false;
 
-// URL of geolocation-data-laden script to inject via a <script> tag in <head>.
-// If false, do not inject a script tag.
-$wgCentralGeoScriptURL = '//bits.wikimedia.org/geoiplookup';
-
 // The script path on the wiki that hosts the CentralNotice infrastructure
 // For example 'http://meta.wikimedia.org/w/index.php'
 $wgCentralPagePath = false;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice057bd338f304a61db2a841b6d1733b64584a4e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>

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

Reply via email to