dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4892b3c
)
Use wfExpandUrl+PROTO_CANONICAL inside of getCanonicalURL instead of just prepending...
author
Daniel Friesen
<dantman@users.mediawiki.org>
Sat, 3 Sep 2011 13:17:55 +0000
(13:17 +0000)
committer
Daniel Friesen
<dantman@users.mediawiki.org>
Sat, 3 Sep 2011 13:17:55 +0000
(13:17 +0000)
includes/Title.php
patch
|
blob
|
history
diff --git
a/includes/Title.php
b/includes/Title.php
index
023b3d8
..
274bd25
100644
(file)
--- a/
includes/Title.php
+++ b/
includes/Title.php
@@
-1045,8
+1045,8
@@
class Title {
*/
public function getCanonicalURL( $query = '', $variant = false ) {
global $wgCanonicalServer;
- $url =
$wgCanonicalServer . $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(
);
- wfRunHooks( '
GetCanonicalURL
', array( &$this, &$url, $query ) );
+ $url =
wfExpandUrl( $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(), PROTO_CANONICAL
);
+ wfRunHooks( '', array( &$this, &$url, $query ) );
return $url;
}