dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Space
[lhc/web/wiklou.git]
/
includes
/
WikiMap.php
diff --git
a/includes/WikiMap.php
b/includes/WikiMap.php
index
e68a232
..
e12f7ab
100644
(file)
--- a/
includes/WikiMap.php
+++ b/
includes/WikiMap.php
@@
-12,7
+12,7
@@
class WikiMap {
* @return WikiReference object or null if the wiki was not found
*/
public static function getWiki( $wikiID ) {
* @return WikiReference object or null if the wiki was not found
*/
public static function getWiki( $wikiID ) {
- global $wgConf
, $IP
;
+ global $wgConf;
$wgConf->loadFullData();
$wgConf->loadFullData();
@@
-41,7
+41,7
@@
class WikiMap {
if ( $wiki ) {
return $wiki->getDisplayName();
}
if ( $wiki ) {
return $wiki->getDisplayName();
}
- return $wiki
_id
;
+ return $wiki
ID
;
}
/**
}
/**
@@
-68,12
+68,14
@@
class WikiMap {
global $wgUser;
$sk = $wgUser->getSkin();
global $wgUser;
$sk = $wgUser->getSkin();
- if ( !$text )
+ if ( !$text )
{
$text = $page;
$text = $page;
+ }
$url = self::getForeignURL( $wikiID, $page );
$url = self::getForeignURL( $wikiID, $page );
- if ( $url === false )
+ if ( $url === false )
{
return false;
return false;
+ }
return $sk->makeExternalLink( $url, $text );
}
return $sk->makeExternalLink( $url, $text );
}
@@
-88,8
+90,9
@@
class WikiMap {
public static function getForeignURL( $wikiID, $page ) {
$wiki = WikiMap::getWiki( $wikiID );
public static function getForeignURL( $wikiID, $page ) {
$wiki = WikiMap::getWiki( $wikiID );
- if ( $wiki )
+ if ( $wiki )
{
return $wiki->getUrl( $page );
return $wiki->getUrl( $page );
+ }
return false;
}
return false;
}