summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkondou <kondou@ts.unde.re>2013-08-09 18:01:49 +0200
committerkondou <kondou@ts.unde.re>2013-08-09 18:01:49 +0200
commit605050df9b42ba68b2d8c34a4075a5af4ebd312c (patch)
treec0a15612fc7c7bb65a90f1c4dedf30d85d4d3f5f
parent1a4465f41d3fe334f42782545e3130a19796e590 (diff)
downloadnextcloud-server-605050df9b42ba68b2d8c34a4075a5af4ebd312c.tar.gz
nextcloud-server-605050df9b42ba68b2d8c34a4075a5af4ebd312c.zip
Log exception at the catching code
-rw-r--r--lib/app.php10
-rw-r--r--settings/ajax/enableapp.php1
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/app.php b/lib/app.php
index 1ff18c799cb..8ac4a16ffd0 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -235,11 +235,11 @@ class OC_App{
$info=OC_App::getAppInfo($app);
$version=OC_Util::getVersion();
if(!isset($info['require']) or !self::isAppVersionCompatible($version, $info['require'])) {
- OC_Log::write('core',
- 'App "'.$info['name'].'" can\'t be installed because it is'
- .' not compatible with this version of ownCloud',
- OC_Log::ERROR);
- throw new \Exception($l->t("App can't be installed because it is not compatible with this version of ownCloud."));
+ throw new \Exception(
+ $l->t("App \"%s\" can't be installed because it is not compatible with this version of ownCloud.",
+ array($info['name'])
+ )
+ );
}else{
OC_Appconfig::setValue( $app, 'enabled', 'yes' );
if(isset($appdata['id'])) {
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 0784736a655..735794360b3 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -7,5 +7,6 @@ try {
OC_App::enable(OC_App::cleanAppId($_POST['appid']));
OC_JSON::success();
} catch (Exception $e) {
+ OC_Log::write('core', $e->getMessage(), OC_Log::ERROR);
OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
}