diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
| commit | 63601400e476c6cf43d985f3e7b9864681695ed4 (patch) | |
| tree | f7846203a952e38aaf66989d0a4702779f549962 /includes/installer/WebInstallerOutput.php | |
| parent | 8ff01378c9e0207f9169b81966a51def645b6a51 (diff) | |
Update to MediaWiki 1.20.2
this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'includes/installer/WebInstallerOutput.php')
| -rw-r--r-- | includes/installer/WebInstallerOutput.php | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php index c6c8a4c2..f3166c25 100644 --- a/includes/installer/WebInstallerOutput.php +++ b/includes/installer/WebInstallerOutput.php @@ -2,6 +2,21 @@ /** * Output handler for the web installer. * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * * @file * @ingroup Deployment */ @@ -93,7 +108,7 @@ class WebInstallerOutput { * @return String */ public function getCSS( $dir ) { - $skinDir = dirname( dirname( dirname( __FILE__ ) ) ) . '/skins'; + $skinDir = dirname( dirname( __DIR__ ) ) . '/skins'; // All these files will be concatenated in sequence and loaded // as one file. @@ -103,6 +118,7 @@ class WebInstallerOutput { $cssFileNames = array( // Basically the "skins.vector" ResourceLoader module styles + 'common/shared.css', 'common/commonElements.css', 'common/commonContent.css', 'common/commonInterface.css', @@ -133,11 +149,12 @@ class WebInstallerOutput { if( $dir == 'rtl' ) { $css = CSSJanus::transform( $css, true ); } + return $css; } /** - * <link> to index.php?css=foobar for the <head> + * "<link>" to index.php?css=foobar for the "<head>" * @return String */ private function getCssUrl( ) { @@ -221,7 +238,6 @@ class WebInstallerOutput { <meta name="robots" content="noindex, nofollow" /> <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 $this->getCssUrl() . "\n"; ?> <?php echo Html::inlineScript( "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) ) . "\n"; ?> <?php echo $this->getJQuery() . "\n"; ?> @@ -258,7 +274,7 @@ class WebInstallerOutput { </div> <div class="portal"><div class="body"> <?php - echo $this->parent->parse( wfMsgNoTrans( 'config-sidebar' ), true ); + echo $this->parent->parse( wfMessage( 'config-sidebar' )->plain(), true ); ?> </div></div> </div> @@ -286,7 +302,7 @@ class WebInstallerOutput { public function outputTitle() { global $wgVersion; - echo htmlspecialchars( wfMsg( 'config-title', $wgVersion ) ); + echo wfMessage( 'config-title', $wgVersion )->escaped(); } public function getJQuery() { |