summaryrefslogtreecommitdiffstats
path: root/settings/ajax/apps/ocs.php
diff options
context:
space:
mode:
authorSam Tuke <samtuke@owncloud.com>2012-09-18 14:35:27 +0100
committerSam Tuke <samtuke@owncloud.com>2012-09-18 14:35:27 +0100
commitb765e883f32bf271c77e4bfa4a88249e5b371a1a (patch)
treefa7851e829f31dc4b7092be509e808ff43bb11c0 /settings/ajax/apps/ocs.php
parent9bfdf47cd43139ca5c3fba255fd4486d06b6d72c (diff)
downloadnextcloud-server-b765e883f32bf271c77e4bfa4a88249e5b371a1a.tar.gz
nextcloud-server-b765e883f32bf271c77e4bfa4a88249e5b371a1a.zip
Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
Added method getAppstoreApps to OC_App Added minor documentation
Diffstat (limited to 'settings/ajax/apps/ocs.php')
-rw-r--r--settings/ajax/apps/ocs.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 71cb046fc8d..a15b21e1744 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -11,7 +11,7 @@ require_once '../../../lib/base.php';
OC_JSON::checkAdminUser();
-$l = OC_L10N::get('core');
+$l = OC_L10N::get('settings');
if(OC_Config::getValue('appstoreenabled', true)==false) {
OCP\JSON::success(array('type' => 'external', 'data' => array()));
@@ -62,5 +62,4 @@ if(is_array($catagoryNames)) {
}
}
-OCP\JSON::success(array('type' => 'external', 'data' => $apps));
-
+OCP\JSON::success(array('type' => 'external', 'data' => $apps)); \ No newline at end of file