diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-09-13 10:23:41 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-09-13 10:23:41 +0000 |
| commit | 227ada32576b7b9de56efe1f5d9ae96c6493be52 (patch) | |
| tree | 41f3a88fb646488e043ba638e92e7f313d2cb64c /settings/ajax/enableapp.php | |
| parent | fa5dff22a02aeb5985215454549ab1020382b197 (diff) | |
| parent | 5a149dcfab960fe21c2df1bf4f1ba27f1a10b2c8 (diff) | |
| download | nextcloud-server-227ada32576b7b9de56efe1f5d9ae96c6493be52.tar.gz nextcloud-server-227ada32576b7b9de56efe1f5d9ae96c6493be52.zip | |
Fix merge conflicts
Diffstat (limited to 'settings/ajax/enableapp.php')
| -rw-r--r-- | settings/ajax/enableapp.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php index bd53a50210c..1075a9a433c 100644 --- a/settings/ajax/enableapp.php +++ b/settings/ajax/enableapp.php @@ -1,13 +1,14 @@ <?php // Init owncloud -require_once('../../lib/base.php'); +require_once '../../lib/base.php'; OC_JSON::checkAdminUser(); OCP\JSON::callCheck(); OC_JSON::setContentTypeHeader(); -if(OC_App::enable($_POST['appid'])){ - OC_JSON::success(); -}else{ - OC_JSON::error(); +$appid = OC_App::enable($_POST['appid']); +if($appid !== false) { + OC_JSON::success(array('data' => array('appid' => $appid))); +} else { + OC_JSON::error(array("data" => array( "message" => $l->t("Could not enable app. ") ))); } |