| Index: branches/wmf/1.17wmf1/extensions/Collection/Collection.body.php |
| — | — | @@ -956,7 +956,7 @@ |
| 957 | 957 | |
| 958 | 958 | $response = self::mwServeCommand( 'render', array( |
| 959 | 959 | 'metabook' => $this->buildJSONCollection( $collection ), |
| 960 | | - 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CANONICAL ), |
| | 960 | + 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CURRENT ), |
| 961 | 961 | 'script_extension' => $wgScriptExtension, |
| 962 | 962 | 'template_blacklist' => wfMsgForContent( 'coll-template_blacklist_title' ), |
| 963 | 963 | 'template_exclusion_category' => wfMsgForContent( 'coll-exclusion_category_title' ), |
| — | — | @@ -989,7 +989,7 @@ |
| 990 | 990 | |
| 991 | 991 | $response = self::mwServeCommand( 'render', array( |
| 992 | 992 | 'collection_id' => $collectionID, |
| 993 | | - 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CANONICAL ), |
| | 993 | + 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CURRENT ), |
| 994 | 994 | 'script_extension' => $wgScriptExtension, |
| 995 | 995 | 'template_blacklist' => wfMsgForContent( 'coll-template_blacklist_title' ), |
| 996 | 996 | 'template_exclusion_category' => wfMsgForContent( 'coll-exclusion_category_title' ), |
| — | — | @@ -1161,7 +1161,7 @@ |
| 1162 | 1162 | |
| 1163 | 1163 | $response = self::mwServeCommand( 'zip_post', array( |
| 1164 | 1164 | 'metabook' => $this->buildJSONCollection( $collection ), |
| 1165 | | - 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CANONICAL ), |
| | 1165 | + 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CURRENT ), |
| 1166 | 1166 | 'script_extension' => $wgScriptExtension, |
| 1167 | 1167 | 'template_blacklist' => wfMsgForContent( 'coll-template_blacklist_title' ), |
| 1168 | 1168 | 'template_exclusion_category' => wfMsgForContent( 'coll-exclusion_category_title' ), |
| Index: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.php |
| — | — | @@ -191,7 +191,7 @@ |
| 192 | 192 | |
| 193 | 193 | function efCentralNoticeGeoLoader( $skin, &$text ) { |
| 194 | 194 | // Insert the geo IP lookup |
| 195 | | - $text .= '<script type="text/javascript" src="http://geoiplookup.wikimedia.org/"></script>'; |
| | 195 | + $text .= '<script type="text/javascript" src="//geoiplookup.wikimedia.org/"></script>'; |
| 196 | 196 | return true; |
| 197 | 197 | } |
| 198 | 198 | |
| Property changes on: branches/wmf/1.17wmf1/extensions/CentralNotice/CentralNotice.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 199 | 199 | Merged /trunk/extensions/CentralNotice/CentralNotice.php:r96180,96228,96273,96286 |
| 200 | 200 | Merged /trunk/phase3/extensions/CentralNotice/CentralNotice.php:r96180,96228,96273,96286 |
| Index: branches/wmf/1.17wmf1/includes/Title.php |
| — | — | @@ -840,7 +840,7 @@ |
| 841 | 841 | # Finally, add the fragment. |
| 842 | 842 | $url .= $this->getFragmentForURL(); |
| 843 | 843 | |
| 844 | | - wfRunHooks( 'GetFullURL', array( &$this, &$url, $query ) ); |
| | 844 | + wfRunHooks( 'GetFullURL', array( &$this, &$url, $query, $variant ) ); |
| 845 | 845 | return $url; |
| 846 | 846 | } |
| 847 | 847 | |
| — | — | @@ -999,7 +999,7 @@ |
| 1000 | 1000 | global $wgInternalServer, $wgServer; |
| 1001 | 1001 | $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer; |
| 1002 | 1002 | $url = wfExpandUrl( $server . $this->getLocalURL( $query, $variant ), PROTO_HTTP ); |
| 1003 | | - wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query ) ); |
| | 1003 | + wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query, $variant ) ); |
| 1004 | 1004 | return $url; |
| 1005 | 1005 | } |
| 1006 | 1006 | |
| — | — | @@ -1016,8 +1016,8 @@ |
| 1017 | 1017 | */ |
| 1018 | 1018 | public function getCanonicalURL( $query = '', $variant = false ) { |
| 1019 | 1019 | global $wgCanonicalServer; |
| 1020 | | - $url = $wgCanonicalServer . $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(); |
| 1021 | | - wfRunHooks( 'GetCanonicalURL', array( &$this, &$url, $query ) ); |
| | 1020 | + $url = wfExpandUrl( $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(), PROTO_CANONICAL ); |
| | 1021 | + wfRunHooks( 'GetCanonicalURL', array( &$this, &$url, $query, $variant ) ); |
| 1022 | 1022 | return $url; |
| 1023 | 1023 | } |
| 1024 | 1024 | |
| Property changes on: branches/wmf/1.17wmf1/includes/Title.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1025 | 1025 | Merged /trunk/phase3/includes/Title.php:r96180,96228,96273,96286 |