diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2011-12-03 13:29:22 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2011-12-03 13:29:22 +0100 |
| commit | ca32f08966f1b51fcb19460f0996bb0c4048e6fe (patch) | |
| tree | ec04cc15b867bc21eedca904cea9af0254531a11 /includes/installer/WebInstallerOutput.php | |
| parent | a22fbfc60f36f5f7ee10d5ae6fe347340c2ee67c (diff) | |
Update to MediaWiki 1.18.0
* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
Diffstat (limited to 'includes/installer/WebInstallerOutput.php')
| -rw-r--r-- | includes/installer/WebInstallerOutput.php | 27 |
1 files changed, 19 insertions, 8 deletions
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 + * <link> to index.php?css=foobar for the <head> * @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 { <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <title><?php $this->outputTitle(); ?></title> <?php echo Html::linkedStyle( '../skins/common/shared.css' ) . "\n"; ?> - <?php echo Html::linkedStyle( $this->getCssUrl() ) . "\n"; ?> + <?php echo $this->getCssUrl() . "\n"; ?> <?php echo Html::inlineScript( "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) ) . "\n"; ?> <?php echo $this->getJQuery() . "\n"; ?> <?php echo Html::linkedScript( '../skins/common/config.js' ) . "\n"; ?> @@ -249,7 +260,7 @@ class WebInstallerOutput { <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta name="robots" content="noindex, nofollow" /> <title><?php $this->outputTitle(); ?></title> - <?php echo Html::linkedStyle( $this->getCssUrl() ) . "\n"; ?> + <?php echo $this->getCssUrl() . "\n"; ?> <?php echo $this->getJQuery(); ?> <?php echo Html::linkedScript( '../skins/common/config.js' ); ?> </head> |