summaryrefslogtreecommitdiffstats
path: root/settings/ajax
diff options
context:
space:
mode:
authorSam Tuke <samtuke@owncloud.com>2012-09-18 14:36:08 +0100
committerSam Tuke <samtuke@owncloud.com>2012-09-18 14:36:08 +0100
commitdc0dc56d481844f55d08b08736b6ce8d7d2918e1 (patch)
tree8994e1c06f3e6e59648187394511571bfc3efc25 /settings/ajax
parentb765e883f32bf271c77e4bfa4a88249e5b371a1a (diff)
parent06e963c54f3067381784c976df75c250e43a95bd (diff)
downloadnextcloud-server-dc0dc56d481844f55d08b08736b6ce8d7d2918e1.tar.gz
nextcloud-server-dc0dc56d481844f55d08b08736b6ce8d7d2918e1.zip
Merge branch 'master' of https://github.com/owncloud/core
Diffstat (limited to 'settings/ajax')
-rw-r--r--settings/ajax/apps/ocs.php2
-rw-r--r--settings/ajax/enableapp.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index a15b21e1744..fb78cc89248 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -62,4 +62,4 @@ if(is_array($catagoryNames)) {
}
}
-OCP\JSON::success(array('type' => 'external', 'data' => $apps)); \ No newline at end of file
+OCP\JSON::success(array('type' => 'external', 'data' => $apps));
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index 1075a9a433c..c3b3491db93 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -10,5 +10,6 @@ $appid = OC_App::enable($_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. ") )));
}