Include short descriptions for extensions bundled in the release

[lhc/web/wiklou.git] / includes / installer / WebInstallerPage.php

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index d4b3d65..b12b686 100644 (file)
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -948,11 +948,20 @@ class WebInstaller_Options extends WebInstallerPage {
                if ( $extensions ) {
                        $extHtml = $this->getFieldSetStart( 'config-extensions' );
 
+                       /* Force a recache, so we load extensions descriptions */
+                       global $wgLang;
+                       $lc = Language::getLocalisationCache();
+                       $lc->setInitialisedLanguages( array() );
+                       $lc->getItem( $wgLang->mCode, '' );
+                       LinkCache::singleton()->useDatabase( false );
+
                        foreach ( $extensions as $ext ) {
                                $extHtml .= $this->parent->getCheckBox( array(
-                                       'var' => "ext-$ext",
-                                       'rawtext' => $ext,
-                               ) );
+                                               'var' => "ext-{$ext['name']}",
+                                               'rawtext' => "<b>{$ext['name']}</b>: " .
+                                               wfMessage( $ext['descriptionmsg'] )->useDatabase( false )->parse(),
+                                       ) );
+
                        }
 
                        $extHtml .= $this->parent->getHelpBox( 'config-extensions-help' ) .
@@ -1175,11 +1184,17 @@ class WebInstaller_Options extends WebInstallerPage {
                        $this->setVar( 'wgRightsIcon', '' );
                }
 
-               $extsAvailable = $this->parent->findExtensions();
+               $extsAvailable = array_map(
+                       function($e) {
+                               if( isset($e['name']) ) {
+                                       return $e['name'];
+                               }
+                       }, $this->parent->findExtensions() );
                $extsToInstall = array();
-               foreach ( $extsAvailable as $ext ) {
+               foreach ( $extsAvailable as $key => $ext ) {
+                               var_dump("config_ext-$ext");
                        if ( $this->parent->request->getCheck( 'config_ext-' . $ext ) ) {
-                               $extsToInstall[] = $ext;
+                               $extsToInstall[] = $extsAvailable[ $key ];
                        }
                }
                $this->parent->setVar( '_Extensions', $extsToInstall );