update to MediaWiki 1.16.0

1 files changed, 12 insertions, 19 deletions

diff --git a/skins/Simple.php b/skins/Simple.php
index b26f50d0..416dc3f6 100644
--- a/skins/Simple.php
+++ b/skins/Simple.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * See docs/skin.txt
+ * Simple: A lightweight skin with a simple white-background sidebar and no
+ * top bar.
  *
- * @todo document
  * @file
  * @ingroup Skins
  */
@@ -14,34 +14,29 @@ if( !defined( 'MEDIAWIKI' ) )
 require_once( dirname(__FILE__) . '/MonoBook.php' );
 
 /**
- * @todo document
+ * Inherit main code from SkinTemplate, set the CSS and template filter.
  * @ingroup Skins
  */
 class SkinSimple extends SkinTemplate {
-	function initPage( OutputPage $out ) {
-		SkinTemplate::initPage( $out );
-		$this->skinname  = 'simple';
-		$this->stylename = 'simple';
-		$this->template  = 'MonoBookTemplate';
-	}
+	var $skinname = 'simple', $stylename = 'simple',
+		$template = 'MonoBookTemplate', $useHeadElement = true;
 
 	function setupSkinUserCss( OutputPage $out ){
 		$out->addStyle( 'simple/main.css', 'screen' );
 		$out->addStyle( 'simple/rtl.css', '', '', 'rtl' );
-
 	}
 
 	function reallyGenerateUserStylesheet() {
 		global $wgUser;
 		$s = '';
-		if (($undopt = $wgUser->getOption("underline")) != 2) {
+		if( ( $undopt = $wgUser->getOption( 'underline' ) ) != 2 ) {
 			$underline = $undopt ? 'underline' : 'none';
 			$s .= "a { text-decoration: $underline; }\n";
 		}
-		if ($wgUser->getOption('highlightbroken')) {
+		if( $wgUser->getOption( 'highlightbroken' ) ) {
 			$s .= "a.new, #quickbar a.new { text-decoration: line-through; }\n";
 		} else {
-			$s .= <<<END
+			$s .= <<<CSS
 a.new, #quickbar a.new,
 a.stub, #quickbar a.stub {
 	color: inherit;
@@ -57,19 +52,17 @@ a.stub:after, #quickbar a.stub:after {
 	color: #772233;
 	text-decoration: $underline;
 }
-END;
+CSS;
 		}
-		if ($wgUser->getOption('justify')) {
+		if( $wgUser->getOption( 'justify' ) ) {
 			$s .= "#article, #bodyContent { text-align: justify; }\n";
 		}
-		if (!$wgUser->getOption('showtoc')) {
+		if( !$wgUser->getOption( 'showtoc' ) ) {
 			$s .= "#toc { display: none; }\n";
 		}
-		if (!$wgUser->getOption('editsection')) {
+		if( !$wgUser->getOption( 'editsection' ) ) {
 			$s .= ".editsection { display: none; }\n";
 		}
 		return $s;
 	}
 }
-
-