From 1a4465f41d3fe334f42782545e3130a19796e590 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Tue, 6 Aug 2013 17:19:18 +0200
Subject: Improve app-management

- Better error messages

- Translate untranslated strings

Basically picks non-app-dependency related stuff from #4017
---
 settings/ajax/enableapp.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'settings/ajax/enableapp.php')

diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index ab84aee5166..0784736a655 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -3,10 +3,9 @@
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 
-$appid = OC_App::enable(OC_App::cleanAppId($_POST['appid']));
-if($appid !== false) {
-	OC_JSON::success(array('data' => array('appid' => $appid)));
-} else {
-	$l = OC_L10N::get('settings');	
-	OC_JSON::error(array("data" => array( "message" => $l->t("Could not enable app. ") )));
+try {
+	OC_App::enable(OC_App::cleanAppId($_POST['appid']));
+	OC_JSON::success();
+} catch (Exception $e) {
+	OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
 }
-- 
cgit v1.2.3