Merge "Installer: properly override default $wgLogo value"

[lhc/web/wiklou.git] / includes / installer / WebInstallerOutput.php
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php

index 7a7f125..c3fd51d 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -43,7 +43,7 @@ class WebInstallerOutput {
  
         /**
          * Buffered contents that haven't been output yet
-        * @var String
+        * @var string
          */
         private $contents = '';
  
@@ -127,14 +127,14 @@ class WebInstallerOutput {
          *
          * @param string $dir 'ltr' or 'rtl'
          *
-        * @return String
+        * @return string
          */
         public function getCSS( $dir ) {
                 // All CSS files these modules reference will be concatenated in sequence
                 // and loaded as one file.
                 $moduleNames = array(
                         'mediawiki.legacy.shared',
-                       'skins.common.interface',
+                       'mediawiki.skinning.interface',
                         'skins.vector.styles',
                         'mediawiki.legacy.config',
                 );
@@ -210,7 +210,7 @@ class WebInstallerOutput {
         /**
          * "<link>" to index.php?css=foobar for the "<head>"
          *
-        * @return String
+        * @return string
          */
         private function getCssUrl() {
                 return Html::linkedStyle( $_SERVER['PHP_SELF'] . '?css=' . $this->getDir() );
@@ -364,7 +364,7 @@ class WebInstallerOutput {
          * @return string
          */
         public function getJQuery() {
-               return Html::linkedScript( "../resources/src/jquery/jquery.js" );
+               return Html::linkedScript( "../resources/lib/jquery/jquery.js" );
         }
  
  }