BUG 6807 Avoid fatal error when installation crashes

An array sometimes is being passed as the error log, which was causing
a fatal error when the installation crashed. This also hides the real
reason of the crash, since the installation log never shows.
This commit is contained in:
Alexandre Rosenfeld
2011-04-28 19:04:32 -04:00
parent 156616b369
commit 11f57e31a8
2 changed files with 5 additions and 2 deletions

View File

@@ -561,7 +561,7 @@ class Installer
{
array_push($this->report,$text);
if ($failed)
throw new Exception($text);
throw new Exception(is_string($text) ? $text : var_export($text, true));
}
}
?>

View File

@@ -302,7 +302,10 @@ else if($action==="install")
if (isset($report))
$logger->log("Installation report\n" . neat_r(array($report)));
else
$logger->log("** No installation report **");
$logger->log("** Installation crashed **");
if (is_string($installError))
$logger->log("Error message: $installError");
if ($installError) {
$logger->log("Installation ending with errors");