Rename Skin::addToSidebar() to Skin::addToSidebarPlain() and have it take plain text...

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

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index c082502..d13268c 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -314,7 +314,7 @@ class SkinTemplate extends Skin {
                $lang = $wgLang->getCode();
                $dir  = $wgLang->getDir();
                if ( $lang !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) {
-                       $attrs = "lang='$lang' xml:lang='$lang' dir='$dir'";
+                       $attrs = " lang='$lang' dir='$dir'";
 
                        $tpl->set( 'userlangattributes', $attrs );
 
@@ -423,6 +423,12 @@ class SkinTemplate extends Skin {
 
                        $tpl->setRef( 'credits', $this->credits );
 
+               } elseif ( isset( $oldid ) && !isset( $diff ) ) {
+                       $tpl->set( 'copyright', $this->getCopyright() );
+                       $tpl->set( 'viewcount', false );
+                       $tpl->set( 'lastmod', false );
+                       $tpl->set( 'credits', false );
+                       $tpl->set( 'numberofwatchingusers', false );
                } else {
                        $tpl->set( 'copyright', false );
                        $tpl->set( 'viewcount', false );
@@ -485,14 +491,6 @@ class SkinTemplate extends Skin {
                $content_actions = $this->buildContentActionUrls();
                $tpl->setRef( 'content_actions', $content_actions );
 
-               // XXX: attach this from javascript, same with section editing
-               if( $this->iseditable && $wgUser->getOption( 'editondblclick' ) ){
-                       $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
-                       $tpl->set( 'body_ondblclick', 'document.location = "' . $encEditUrl . '";' );
-               } else {
-                       $tpl->set( 'body_ondblclick', false );
-               }
-               $tpl->set( 'body_onload', false );
                $tpl->set( 'sidebar', $this->buildSidebar() );
                $tpl->set( 'nav_urls', $this->buildNavUrls() );