Revert 28517 for now. Puts non-standards-compliant code in shared.css to work around...

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

diff --git a/skins/Standard.php b/skins/Standard.php
index 90bcfc5..ed00d59 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -3,8 +3,7 @@
  * See skin.txt
  *
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @addtogroup Skins
  */
 
 if( !defined( 'MEDIAWIKI' ) )
@@ -12,21 +11,20 @@ if( !defined( 'MEDIAWIKI' ) )
 
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @addtogroup Skins
  */
 class SkinStandard extends Skin {
 
        /**
         *
         */
-       function getHeadScripts() {
-               global $wgStylePath, $wgJsMimeType;
+       function getHeadScripts( $allowUserJs ) {
+               global $wgStylePath, $wgJsMimeType, $wgStyleVersion;
 
-               $s = parent::getHeadScripts();
+               $s = parent::getHeadScripts( $allowUserJs );
                if ( 3 == $this->qbSetting() ) { # Floating left
                        $s .= "<script language='javascript' type='$wgJsMimeType' " .
-                         "src='{$wgStylePath}/common/sticky.js'></script>\n";
+                         "src='{$wgStylePath}/common/sticky.js?$wgStyleVersion'></script>\n";
                }
                return $s;
        }
@@ -35,14 +33,14 @@ class SkinStandard extends Skin {
         *
         */
        function getUserStyles() {
-               global $wgStylePath;
+               global $wgStylePath, $wgStyleVersion;
                $s = '';
                if ( 3 == $this->qbSetting() ) { # Floating left
                        $s .= "<style type='text/css'>\n" .
-                         "@import '{$wgStylePath}/common/quickbar.css';\n</style>\n";
+                         "@import '{$wgStylePath}/common/quickbar.css?$wgStyleVersion';\n</style>\n";
                } else if ( 4 == $this->qbSetting() ) { # Floating right
                        $s .= "<style type='text/css'>\n" .
-                         "@import '{$wgStylePath}/common/quickbar-right.css';\n</style>\n";
+                         "@import '{$wgStylePath}/common/quickbar-right.css?$wgStyleVersion';\n</style>\n";
                }
                $s .= parent::getUserStyles();
                return $s;
@@ -248,7 +246,7 @@ class SkinStandard extends Skin {
                                {
                                        $s .= $sep . $this->watchThisPage();
                                }
-                               if ( $wgTitle->userCanEdit() )
+                               if ( $wgTitle->userCan( 'edit' ) )
                                        $s .= $sep . $this->moveThisPage();
                        }
                        if ( $wgUser->isAllowed('delete') and $articleExists ) {
@@ -301,4 +299,4 @@ class SkinStandard extends Skin {
 
 }
 
-?>
+