X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Finstaller%2FCliInstaller.php;h=0ff34b086f63ea96d55539d3d698445ed4523ce0;hb=76a8bfa27824257b6e388aec4937fa041a8eb662;hp=424c9d7b780ba3c3e6b7dfd5e94b50506352ec62;hpb=4cc031607c9b8e17265e51372b94399399254966;p=lhc%2Fweb%2Fwiklou.git

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