From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 3 Aug 2011 18:25:04 +0000 (+0000)
Subject: Follow-up r93258, r93266, r93266: Move the defines to Defines.php
X-Git-Tag: 1.31.0-rc.0~28454
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=6e87d4001fd0f408d2c6160f89aac2362f390436;p=lhc%2Fweb%2Fwiklou.git

Follow-up r93258, r93266, r93266: Move the defines to Defines.php
---

diff --git a/includes/Defines.php b/includes/Defines.php
index 0252c402c5..2d7e540e3f 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -240,3 +240,12 @@ define( 'APCOND_AGE_FROM_EDIT', 7 );
 define( 'APCOND_BLOCKED', 8 );
 define( 'APCOND_ISBOT', 9 );
 /**@}*/
+
+/**
+ * Protocol constants for wfExpandUrl()
+ */
+define( 'PROTO_HTTP', 'http://' );
+define( 'PROTO_HTTPS', 'https://' );
+define( 'PROTO_RELATIVE', '//' );
+define( 'PROTO_CURRENT', null );
+
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b884a895bf..98a1ea75fc 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -428,11 +428,6 @@ function wfAppendQuery( $url, $query ) {
 	return $url;
 }
 
-define( 'PROTO_HTTP', 'http://' );
-define( 'PROTO_HTTPS', 'https://' );
-define( 'PROTO_RELATIVE', '//' );
-define( 'PROTO_CURRENT', null );
-
 /**
  * Expand a potentially local URL to a fully-qualified URL.  Assumes $wgServer
  * is correct.