| Index: trunk/phase3/includes/Defines.php |
| — | — | @@ -240,3 +240,12 @@ |
| 241 | 241 | define( 'APCOND_BLOCKED', 8 ); |
| 242 | 242 | define( 'APCOND_ISBOT', 9 ); |
| 243 | 243 | /**@}*/ |
| | 244 | + |
| | 245 | +/** |
| | 246 | + * Protocol constants for wfExpandUrl() |
| | 247 | + */ |
| | 248 | +define( 'PROTO_HTTP', 'http://' ); |
| | 249 | +define( 'PROTO_HTTPS', 'https://' ); |
| | 250 | +define( 'PROTO_RELATIVE', '//' ); |
| | 251 | +define( 'PROTO_CURRENT', null ); |
| | 252 | + |
| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -428,11 +428,6 @@ |
| 429 | 429 | return $url; |
| 430 | 430 | } |
| 431 | 431 | |
| 432 | | -define( 'PROTO_HTTP', 'http://' ); |
| 433 | | -define( 'PROTO_HTTPS', 'https://' ); |
| 434 | | -define( 'PROTO_RELATIVE', '//' ); |
| 435 | | -define( 'PROTO_CURRENT', null ); |
| 436 | | - |
| 437 | 432 | /** |
| 438 | 433 | * Expand a potentially local URL to a fully-qualified URL. Assumes $wgServer |
| 439 | 434 | * is correct. |