| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3321,7 +3321,7 @@ |
| 3322 | 3322 | '$1', |
| 3323 | 3323 | "Special:$page/$token", |
| 3324 | 3324 | $wgArticlePath ), |
| 3325 | | - PROT_HTTP |
| | 3325 | + PROTO_HTTP |
| 3326 | 3326 | ); |
| 3327 | 3327 | } |
| 3328 | 3328 | |
| Index: trunk/phase3/includes/parser/CoreParserFunctions.php |
| — | — | @@ -723,7 +723,7 @@ |
| 724 | 724 | // ... and we can |
| 725 | 725 | if ( $mto && !$mto->isError() ) { |
| 726 | 726 | // ... change the URL to point to a thumbnail. |
| 727 | | - $url = wfExpandUrl( $mto->getUrl(), PROT_RELATIVE ); |
| | 727 | + $url = wfExpandUrl( $mto->getUrl(), PROTO_RELATIVE ); |
| 728 | 728 | } |
| 729 | 729 | } |
| 730 | 730 | if ( $option == 'nowiki' ) { |
| Index: trunk/phase3/includes/filerepo/ForeignAPIRepo.php |
| — | — | @@ -370,7 +370,7 @@ |
| 371 | 371 | public static function httpGet( $url, $timeout = 'default', $options = array() ) { |
| 372 | 372 | $options['timeout'] = $timeout; |
| 373 | 373 | /* Http::get */ |
| 374 | | - $url = wfExpandUrl( $url, PROT_HTTP ); |
| | 374 | + $url = wfExpandUrl( $url, PROTO_HTTP ); |
| 375 | 375 | wfDebug( "ForeignAPIRepo: HTTP GET: $url\n" ); |
| 376 | 376 | $options['method'] = "GET"; |
| 377 | 377 | |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -2820,7 +2820,7 @@ |
| 2821 | 2821 | 'type' => 'application/rsd+xml', |
| 2822 | 2822 | // Output a protocol-relative URL here if $wgServer is protocol-relative |
| 2823 | 2823 | // Whether RSD accepts relative or protocol-relative URLs is completely undocumented, though |
| 2824 | | - 'href' => wfExpandUrl( wfAppendQuery( wfScript( 'api' ), array( 'action' => 'rsd' ) ), PROT_RELATIVE ), |
| | 2824 | + 'href' => wfExpandUrl( wfAppendQuery( wfScript( 'api' ), array( 'action' => 'rsd' ) ), PROTO_RELATIVE ), |
| 2825 | 2825 | ) ); |
| 2826 | 2826 | } |
| 2827 | 2827 | |
| Index: trunk/phase3/includes/resourceloader/ResourceLoaderFileModule.php |
| — | — | @@ -206,7 +206,7 @@ |
| 207 | 207 | } |
| 208 | 208 | // Make sure the remote base path is a complete valid URL, |
| 209 | 209 | // but possibly protocol-relative to avoid cache pollution |
| 210 | | - $this->remoteBasePath = wfExpandUrl( $this->remoteBasePath, PROT_RELATIVE ); |
| | 210 | + $this->remoteBasePath = wfExpandUrl( $this->remoteBasePath, PROTO_RELATIVE ); |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | /** |
| Index: trunk/phase3/includes/libs/CSSMin.php |
| — | — | @@ -138,7 +138,7 @@ |
| 139 | 139 | $expanded = wfExpandUrl( $match['file'][0] ); |
| 140 | 140 | $origLength = strlen( $match['file'][0] ); |
| 141 | 141 | $lengthIncrease = strlen( $expanded ) - $origLength; |
| 142 | | - $source = substr_replace( $source, wfExpandUrl( $match['file'][0], PROT_RELATIVE ), |
| | 142 | + $source = substr_replace( $source, wfExpandUrl( $match['file'][0], PROTO_RELATIVE ), |
| 143 | 143 | $match['file'][1], $origLength, |
| 144 | 144 | ); |
| 145 | 145 | } |
| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -32,7 +32,7 @@ |
| 33 | 33 | * @return Mixed: (bool)false on failure or a string on success |
| 34 | 34 | */ |
| 35 | 35 | public static function request( $method, $url, $options = array() ) { |
| 36 | | - $url = wfExpandUrl( $url, PROT_HTTP ); |
| | 36 | + $url = wfExpandUrl( $url, PROTO_HTTP ); |
| 37 | 37 | wfDebug( "HTTP: $method: $url\n" ); |
| 38 | 38 | $options['method'] = strtoupper( $method ); |
| 39 | 39 | |