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

diff --git a/includes/Defines.php b/includes/Defines.php
index 0252c40..2d7e540 100644 (file)
--- 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 b884a89..98a1ea7 100644 (file)
--- 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.