| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1045,8 +1045,8 @@ |
| 1046 | 1046 | */ |
| 1047 | 1047 | public function getCanonicalURL( $query = '', $variant = false ) { |
| 1048 | 1048 | global $wgCanonicalServer; |
| 1049 | | - $url = $wgCanonicalServer . $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(); |
| 1050 | | - wfRunHooks( 'GetCanonicalURL', array( &$this, &$url, $query ) ); |
| | 1049 | + $url = wfExpandUrl( $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(), PROTO_CANONICAL ); |
| | 1050 | + wfRunHooks( '', array( &$this, &$url, $query ) ); |
| 1051 | 1051 | return $url; |
| 1052 | 1052 | } |
| 1053 | 1053 | |