From 6e87d4001fd0f408d2c6160f89aac2362f390436 Mon Sep 17 00:00:00 2001 From: Platonides Date: Wed, 3 Aug 2011 18:25:04 +0000 Subject: [PATCH] Follow-up r93258, r93266, r93266: Move the defines to Defines.php --- includes/Defines.php | 9 +++++++++ includes/GlobalFunctions.php | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) 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. -- 2.20.1