http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69115

Revision: 69115
Author:   avar
Date:     2010-07-06 21:34:20 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
new-installer: Make findExtensions() return a key-value array

Now we return e.g.:

    array( 'Cite', 'LiquidThreads' );

Instead return:

    array(
        'Cite' => null,
        'LiquidThreads' => $some_config
    );

Where $some_config is a yet-to-be determined configuration. It's
intended for e.g. sourcing SQL tables that the extension needs.

Modified Paths:
--------------
    trunk/phase3/includes/installer/Installer.php
    trunk/phase3/includes/installer/WebInstaller.php

Modified: trunk/phase3/includes/installer/Installer.php
===================================================================
--- trunk/phase3/includes/installer/Installer.php       2010-07-06 21:31:43 UTC 
(rev 69114)
+++ trunk/phase3/includes/installer/Installer.php       2010-07-06 21:34:20 UTC 
(rev 69115)
@@ -844,7 +844,7 @@
                $dh = opendir( $dir );
                while ( ( $file = readdir( $dh ) ) !== false ) {
                        if( file_exists( "$dir/$file/$file.php" ) ) {
-                               $exts[] = $file;
+                               $exts[$file] = null;
                        }
                }
                $this->setVar( '_Extensions', $exts );

Modified: trunk/phase3/includes/installer/WebInstaller.php
===================================================================
--- trunk/phase3/includes/installer/WebInstaller.php    2010-07-06 21:31:43 UTC 
(rev 69114)
+++ trunk/phase3/includes/installer/WebInstaller.php    2010-07-06 21:34:20 UTC 
(rev 69115)
@@ -1387,7 +1387,7 @@
                $extensions = $this->parent->findExtensions();
                if( $extensions ) {
                        $extHtml = $this->parent->getFieldsetStart( 
'config-extensions' );
-                       foreach( $extensions as $ext ) {
+                       foreach( array_keys($extensions) as $ext ) {
                                $extHtml .= $this->parent->getCheckBox( array(
                                        'var' => "ext-$ext",
                                        'rawtext' => $ext,



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to