X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWikiMap.php;h=4a5e2bcfb6716fbaa911fbed7a477248d6032296;hb=a00e7e7c1d79c29dc723b02ea1228d46d0efe5bc;hp=119017258c1c5b12c05a89fd3a6faa27d3b8847d;hpb=c47bd7668b08ef161ba099b6a5c4d6dd87489dd8;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/WikiMap.php b/includes/WikiMap.php index 119017258c..4a5e2bcfb6 100644 --- a/includes/WikiMap.php +++ b/includes/WikiMap.php @@ -109,7 +109,7 @@ class WikiMap { $wiki = WikiMap::getWiki( $wikiID ); if ( $wiki ) { - return $wiki->getUrl( $page ); + return $wiki->getFullUrl( $page ); } return false; @@ -126,6 +126,13 @@ class WikiReference { private $mServer; ///< server URL, may be protocol-relative, e.g. '//www.mediawiki.org' private $mPath; ///< path, '/wiki/$1' + /** + * @param $major string + * @param $minor string + * @param $canonicalServer string + * @param $path string + * @param $server null|string + */ public function __construct( $major, $minor, $canonicalServer, $path, $server = null ) { $this->mMajor = $major; $this->mMinor = $minor; @@ -186,8 +193,17 @@ class WikiReference { return $this->mCanonicalServer . $this->getLocalUrl( $page ); } + /** + * Get a canonical server URL + * @return string + */ + public function getCanonicalServer() { + return $this->mCanonicalServer; + } + /** * Alias for getCanonicalUrl(), for backwards compatibility. + * @param $page string * @return String */ public function getUrl( $page ) {