Category namespaces

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

diff --git a/includes/Skin.php b/includes/Skin.php
index 806ef15..f078b36 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -220,7 +220,7 @@ class Skin {
                  (!$wgTitle->isProtected() || $wgUser->isSysop()) ) {
                        $t = wfMsg( "editthispage" );
                        $oid = $red = "";
-                       if ( $redirect ) { 
+                       if ( !empty($redirect) ) { 
                                $red = "&redirect={$redirect}"; 
                        }
                        if ( !empty($oldid) && ! isset( $diff ) ) {
@@ -541,7 +541,7 @@ class Skin {
                        global $wgExtraSubtitle;
                        $sub = wfMsg( "fromwikipedia" ) . $wgExtraSubtitle;
                }
-               if($wgOut->isArticle() && $wgNamespacesWithSubpages[$wgTitle->getNamespace()]) {
+               if($wgOut->isArticle() && !empty($wgNamespacesWithSubpages[$wgTitle->getNamespace()])) {
                        $ptext=$wgTitle->getPrefixedText();
                        if(preg_match("/\//",$ptext)) {
                                $sub.="</p><p class='subpages'>";
@@ -2544,7 +2544,7 @@ class Skin {
                );
                $toolbar ="<script type='text/javascript'>\n/*<![CDATA[*/\n";
                
-               $toolbar.="document.writeln(\"<div id='toolbar' tabindex='4000000'>\");\n";
+               $toolbar.="document.writeln(\"<div id='toolbar'>\");\n";
                foreach($toolarray as $tool) {
 
                        $image=$wgUploadPath."/".$tool["image"];
@@ -2566,7 +2566,7 @@ class Skin {
                $toolbar.="addInfobox('" . addslashes( wfMsg( "infobox" ) ) . "','" . addslashes(wfMsg("infobox_alert")) . "');\n";
                $toolbar.="document.writeln(\"</div>\");\n";
                
-               $toolbar.="/*]]>*/</script>";
+               $toolbar.="/*]]>*/\n</script>";
                return $toolbar;
        }
 }