Merge "mw.Upload.BookletLayout: Don't explode when the API call fails with 'exception'"

[lhc/web/wiklou.git] / includes / skins / SkinTemplate.php

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 163f3d5..1328870 100644 (file)
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -1027,7 +1027,9 @@ class SkinTemplate extends Skin {
                                         */
                                        $mode = $user->isWatched( $title ) ? 'unwatch' : 'watch';
                                        $content_navigation['actions'][$mode] = array(
-                                               'class' => $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : false,
+                                               'class' => 'mw-watchlink ' . (
+                                                       $onPage && ( $action == 'watch' || $action == 'unwatch' ) ? 'selected' : ''
+                                               ),
                                                // uses 'watch' or 'unwatch' message
                                                'text' => $this->msg( $mode )->text(),
                                                'href' => $title->getLocalURL( array( 'action' => $mode ) )
@@ -1202,7 +1204,7 @@ class SkinTemplate extends Skin {
                        $nav_urls['print'] = array(
                                'text' => $this->msg( 'printableversion' )->text(),
                                'href' => $this->getTitle()->getLocalURL(
-                                       $request->appendQueryValue( 'printable', 'yes', true ) )
+                                       $request->appendQueryValue( 'printable', 'yes' ) )
                        );
                }
 
@@ -1244,7 +1246,8 @@ class SkinTemplate extends Skin {
 
                        $nav_urls['contributions'] = array(
                                'text' => $this->msg( 'contributions', $rootUser )->text(),
-                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser )
+                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser ),
+                               'tooltip-params' => array( $rootUser ),
                        );
 
                        $nav_urls['log'] = array(
@@ -1260,7 +1263,8 @@ class SkinTemplate extends Skin {
 
                        if ( $this->showEmailUser( $user ) ) {
                                $nav_urls['emailuser'] = array(
-                                       'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser )
+                                       'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser ),
+                                       'tooltip-params' => array( $rootUser ),
                                );
                        }