X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkinTemplate.php;h=4028e78b70e2d646ae160f233a29d0305ddbf8bf;hb=cdfc16d0afa4286cf47b76ccaca3d83fd02ec458;hp=8306304f615ce22404d364c98200cdb3d7560150;hpb=bfe6e5bf3fe7ab8159b3e671ff21abd3b6484578;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 8306304f61..4028e78b70 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -258,7 +258,7 @@ class SkinTemplate extends Skin {
 		/* XXX currently unused, might get useful later
 		$tpl->set( 'editable', ( !$title->isSpecialPage() ) );
 		$tpl->set( 'exists', $title->getArticleID() != 0 );
-		$tpl->set( 'watch', $title->userIsWatching() ? 'unwatch' : 'watch' );
+		$tpl->set( 'watch', $user->isWatched( $title ) ? 'unwatch' : 'watch' );
 		$tpl->set( 'protect', count( $title->isProtected() ) ? 'unprotect' : 'protect' );
 		$tpl->set( 'helppage', $this->msg( 'helppage' )->text() );
 		*/
@@ -426,10 +426,15 @@ class SkinTemplate extends Skin {
 				unset( $tmp );
 				$nt = Title::newFromText( $l );
 				if ( $nt ) {
+					$ilLangName = Language::fetchLanguageName( $nt->getInterwiki() );
+					if ( strval( $ilLangName ) === '' ) {
+						$ilLangName = $l;
+					} else {
+						$ilLangName = $this->getLanguage()->ucfirst( $ilLangName );
+					}
 					$language_urls[] = array(
 						'href' => $nt->getFullURL(),
-						'text' => ( Language::fetchLanguageName( $nt->getInterwiki() ) != '' ?
-									Language::fetchLanguageName( $nt->getInterwiki() ) : $l ),
+						'text' => $ilLangName,
 						'title' => $nt->getText(),
 						'class' => $class,
 						'lang' => $nt->getInterwiki(),
@@ -969,7 +974,7 @@ class SkinTemplate extends Skin {
 					 * a change to that procedure these messages will have to remain as
 					 * the global versions.
 					 */
-					$mode = $title->userIsWatching() ? 'unwatch' : 'watch';
+					$mode = $user->isWatched( $title ) ? 'unwatch' : 'watch';
 					$token = WatchAction::getWatchToken( $title, $user, $mode );
 					$content_navigation['actions'][$mode] = array(
 						'class' => $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : false,