Merge "Change of Title->exists() to Title->isKnown() for subpage links"

[lhc/web/wiklou.git] / skins / Standard.php

diff --git a/skins/Standard.php b/skins/Standard.php
index de63eab..1114e7d 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -40,12 +40,12 @@ class SkinStandard extends SkinLegacy {
                                $rules[] = "/* @noflip */#quickbar { position: fixed; padding: 4px; }";
                        }
                } elseif ( 4 == $qb ) {
-                       $rules[] = "/* @noflip */#quickbar { position: fixed; right: 0px; top: 0px; padding: 4px;}";
+                       $rules[] = "/* @noflip */#quickbar { position: fixed; right: 0; top: 0; padding: 4px; }";
                        $rules[] = "/* @noflip */#quickbar { border-right: 1px solid gray; }";
                        $rules[] = "/* @noflip */#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }";
                        $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }";
                }
-               $style = implode( "\n", $rules );
+               $style = implode( "\n", $rules );
                $out->addInlineStyle( $style, 'flip' );
        }
 
@@ -66,11 +66,11 @@ class StandardTemplate extends LegacyTemplate {
 
                wfProfileOut( __METHOD__ . '-1' );
                wfProfileIn( __METHOD__ . '-2' );
-               $l = $this->getSkin()->getLang()->alignStart();
+               $l = $this->getSkin()->getLanguage()->alignStart();
                $s .= "<td class='bottom' align='$l' valign='top'>";
 
                $s .= $this->bottomLinks();
-               $s .= "\n<br />" . $this->getSkin()->getLang()->pipeList( array(
+               $s .= "\n<br />" . $this->getSkin()->getLanguage()->pipeList( array(
                        $this->getSkin()->mainPageLink(),
                        $this->getSkin()->aboutLink(),
                        Linker::specialLink( 'Recentchanges' ),
@@ -116,10 +116,10 @@ class StandardTemplate extends LegacyTemplate {
 
                $barnumber = 1;
                foreach ( $bar as $browseLinks ) {
-                       if ( $barnumber > 1 ) {
-                               $s .= "\n<hr class='sep' />";
-                       }
                        if ( is_array( $browseLinks ) ) {
+                               if ( $barnumber > 1 ) {
+                                       $s .= "\n<hr class='sep' />";
+                               }
                                foreach ( $browseLinks as $link ) {
                                        if ( $link['text'] != '-' ) {
                                                $s .= "<a href=\"{$link['href']}\">" .
@@ -143,7 +143,7 @@ class StandardTemplate extends LegacyTemplate {
                }
 
                $s .= "\n<hr class='sep' />";
-               $articleExists = $title->getArticleId();
+               $articleExists = $title->getArticleID();
                if ( $this->data['isarticle'] || $action == 'edit' || $action == 'history' || $wpPreview ) {
                        if( $this->data['isarticle'] ) {
                                $s .= '<strong>' . $this->editThisPage() . '</strong>';
@@ -214,12 +214,12 @@ class StandardTemplate extends LegacyTemplate {
                                        )
                                );
 
-                       /*
-                       watching could cause problems in edit mode:
-                       if user edits article, then loads "watch this article" in background and then saves
-                       article with "Watch this article" checkbox disabled, the article is transparently
-                       unwatched. Therefore we do not show the "Watch this page" link in edit mode
-                       */
+                       /**
+                        * Watching could cause problems in edit mode:
+                        * if user edits article, then loads "watch this article" in background and then saves
+                        * article with "Watch this article" checkbox disabled, the article is transparently
+                        * unwatched. Therefore we do not show the "Watch this page" link in edit mode.
+                        */
                        if ( $this->data['loggedin'] && $articleExists ) {
                                if( $action != 'edit' && $action != 'submit' ) {
                                        $s .= $sep . $this->watchThisPage();
@@ -268,7 +268,7 @@ class StandardTemplate extends LegacyTemplate {
                global $wgSiteSupportPage;
                if( $wgSiteSupportPage ) {
                        $s .= "\n<br /><a href=\"" . htmlspecialchars( $wgSiteSupportPage ) .
-                         '" class="internal">' . wfMsg( 'sitesupport' ) . '</a>';
+                       '" class="internal">' . wfMsg( 'sitesupport' ) . '</a>';
                }
 
                $s .= "\n<br /></div>\n";