From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/installer/WebInstallerOutput.php | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'includes/installer/WebInstallerOutput.php') diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php index cb708d13..9eb2c2c6 100644 --- a/includes/installer/WebInstallerOutput.php +++ b/includes/installer/WebInstallerOutput.php @@ -113,11 +113,11 @@ class WebInstallerOutput { } /** - * URL for index.php?css=foobar + * to index.php?css=foobar for the * @return String */ private function getCssUrl( ) { - return $_SERVER['PHP_SELF'] . '?css=' . $this->getDir(); + return Html::linkedStyle( $_SERVER['PHP_SELF'] . '?css=' . $this->getDir() ); } public function useShortHeader( $use = true ) { @@ -139,22 +139,33 @@ class WebInstallerOutput { } } + /** + * @return string + */ public function getDir() { global $wgLang; - if( !is_object( $wgLang ) || !$wgLang->isRtl() ) + if( !is_object( $wgLang ) || !$wgLang->isRtl() ) { return 'ltr'; - else + } else { return 'rtl'; + } } + /** + * @return string + */ public function getLanguageCode() { global $wgLang; - if( !is_object( $wgLang ) ) + if( !is_object( $wgLang ) ) { return 'en'; - else + } else { return $wgLang->getCode(); + } } + /** + * @return array + */ public function getHeadAttribs() { return array( 'dir' => $this->getDir(), @@ -195,7 +206,7 @@ class WebInstallerOutput { <?php $this->outputTitle(); ?> - getCssUrl() ) . "\n"; ?> + getCssUrl() . "\n"; ?> getJQuery() . "\n"; ?> @@ -249,7 +260,7 @@ class WebInstallerOutput { <?php $this->outputTitle(); ?> - getCssUrl() ) . "\n"; ?> + getCssUrl() . "\n"; ?> getJQuery(); ?> -- cgit v1.2.2