diff options
| -rw-r--r-- | lib/app.php | 3 | ||||
| -rw-r--r-- | lib/files.php | 4 | ||||
| -rw-r--r-- | lib/helper.php | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/app.php b/lib/app.php index baacf508d8e..115b7d60f5e 100644 --- a/lib/app.php +++ b/lib/app.php @@ -839,9 +839,8 @@ class OC_App{ OC_Hook::emit('update', 'success', 'Updated '.$info['name'].' app'); } catch (Exception $e) { - echo 'Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"'; OC_Hook::emit('update', 'failure', 'Failed to update '.$info['name'].' app: '.$e->getMessage()); - die; + throw new RuntimeException('Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"'); } OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app)); } diff --git a/lib/files.php b/lib/files.php index f5dffd970d2..ce46d13da41 100644 --- a/lib/files.php +++ b/lib/files.php @@ -62,7 +62,7 @@ class OC_Files { $zip = new ZipArchive(); $filename = OC_Helper::tmpFile('.zip'); if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) { - exit("cannot open <$filename>\n"); + throw new Exception("cannot open '$filename'\n"); } foreach ($files as $file) { $file = $dir . '/' . $file; @@ -93,7 +93,7 @@ class OC_Files { $zip = new ZipArchive(); $filename = OC_Helper::tmpFile('.zip'); if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) { - exit("cannot open <$filename>\n"); + throw new Exception("cannot open '$filename'\n"); } $file = $dir . '/' . $files; self::zipAddDir($file, $zip); diff --git a/lib/helper.php b/lib/helper.php index df0d120976d..ca508e1d933 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -176,8 +176,7 @@ class OC_Helper { }elseif( file_exists( OC::$SERVERROOT."/core/img/$image" )) { return OC::$WEBROOT."/core/img/$image"; }else{ - echo('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); - die(); + throw new RuntimeException('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT); } } |