API: Make action=block return an ISO 8601 timestamp rather than a UNIX timestamp

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

diff --git a/skins/Standard.php b/skins/Standard.php
index fb0a8df..7d4eb9a 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * See skin.txt
+ * See docs/skin.txt
  *
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @file
+ * @ingroup Skins
  */
 
 if( !defined( 'MEDIAWIKI' ) )
@@ -12,18 +12,17 @@ if( !defined( 'MEDIAWIKI' ) )
 
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @ingroup Skins
  */
 class SkinStandard extends Skin {
 
        /**
         *
         */
-       function getHeadScripts() {
+       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?$wgStyleVersion'></script>\n";
@@ -118,7 +117,7 @@ class SkinStandard extends Skin {
                $s .= $this->bottomLinks();
                $s .= "\n<br />" . $this->mainPageLink()
                  . ' | ' . $this->aboutLink()
-                 . ' | ' . self::specialLink( 'recentchanges' )
+                 . ' | ' . $this->specialLink( 'recentchanges' )
                  . ' | ' . $this->searchForm()
                  . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
 
@@ -164,8 +163,8 @@ class SkinStandard extends Skin {
                }
 
                if( $wgUser->isLoggedIn() ) {
-                       $s.= self::specialLink( 'watchlist' ) ;
-                       $s .= $sep . self::makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
+                       $s.= $this->specialLink( 'watchlist' ) ;
+                       $s .= $sep . $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
                                wfMsg( 'mycontris' ), 'target=' . wfUrlencode($wgUser->getName() ) );
                }
                // only show watchlist link if logged in
@@ -220,7 +219,7 @@ class SkinStandard extends Skin {
                                                $link = $nstext . ':' . $link ;
                                        }
 
-                                       $s .= self::makeLink( $link, $text );
+                                       $s .= $this->makeLink( $link, $text );
                                } elseif( $wgTitle->getNamespace() != NS_SPECIAL ) {
                                        # we just throw in a "New page" text to tell the user that he's in edit mode,
                                        # and to avoid messing with the separator that is prepended to the next item
@@ -231,10 +230,10 @@ class SkinStandard extends Skin {
 
                        # "Post a comment" link
                        if( ( $wgTitle->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
-                               $s .= '<br />' . self::makeKnownLinkObj( $wgTitle, wfMsg( 'postcomment' ), 'action=edit&section=new' );
+                               $s .= '<br />' . $this->makeKnownLinkObj( $wgTitle, wfMsg( 'postcomment' ), 'action=edit&section=new' );
                        
                        #if( $tns%2 && $action!='edit' && !$wpPreview) {
-                               #$s.= '<br />'.self::makeKnownLink($wgTitle->getPrefixedText(),wfMsg('postcomment'),'action=edit&section=new');
+                               #$s.= '<br />'.$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg('postcomment'),'action=edit&section=new');
                        #}
 
                        /*
@@ -248,7 +247,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 ) {
@@ -282,9 +281,9 @@ class SkinStandard extends Skin {
                }
 
                if ( $wgUser->isLoggedIn() && ( $wgEnableUploads || $wgRemoteUploads ) ) {
-                       $s .= self::specialLink( 'upload' ) . $sep;
+                       $s .= $this->specialLink( 'upload' ) . $sep;
                }
-               $s .= self::specialLink( 'specialpages' )
+               $s .= $this->specialLink( 'specialpages' )
                  . $sep . $this->bugReportsLink();
 
                global $wgSiteSupportPage;
@@ -301,4 +300,4 @@ class SkinStandard extends Skin {
 
 }
 
-?>
+