Revert "Modify -—with-extensions to throw extension dependency errors"

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

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 0ff34b0..424c9d7 100644 (file)
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -120,11 +120,7 @@ class CliInstaller extends Installer {
                        }
                        $this->setVar( '_Extensions', $status->value );
                } elseif ( isset( $options['with-extensions'] ) ) {
-                       $status = $this->findExtensions();
-                       if ( !$status->isOK() ) {
-                               throw new InstallException( $status );
-                       }
-                       $this->setVar( '_Extensions', array_keys( $status->value ) );
+                       $this->setVar( '_Extensions', array_keys( $this->findExtensions() ) );
                }
 
                // Set up the default skins
@@ -135,11 +131,7 @@ class CliInstaller extends Installer {
                        }
                        $skins = $status->value;
                } else {
-                       $status = $this->findExtensions( 'skins' );
-                       if ( !$status->isOK() ) {
-                               throw new InstallException( $status );
-                       }
-                       $skins = array_keys( $status->value );
+                       $skins = array_keys( $this->findExtensions( 'skins' ) );
                }
                $this->setVar( '_Skins', $skins );