diff options
author | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
commit | 5445b94416f50bb040e7426cadfa458607893f07 (patch) | |
tree | 337b12362333030e0ebda37acb7f25073723a7af /lib/ocsclient.php | |
parent | 7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff) | |
parent | 1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff) | |
download | nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip |
merge master into filesystem
Diffstat (limited to 'lib/ocsclient.php')
-rw-r--r-- | lib/ocsclient.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 24081425f1e..ca0665da436 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -39,11 +39,11 @@ class OC_OCSClient{ return($url); } - /** - * @brief Get the url of the OCS KB server. - * @returns string of the KB server - * This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default - */ + /** + * @brief Get the url of the OCS KB server. + * @returns string of the KB server + * This function returns the url of the OCS knowledge base server. It´s possible to set it in the config file or it will fallback to the default + */ private static function getKBURL() { $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1'); return($url); @@ -59,7 +59,7 @@ class OC_OCSClient{ return($data); } - /** + /** * @brief Get all the categories from the OCS server * @returns array with category ids * @note returns NULL if config value appstoreenabled is set to false @@ -242,7 +242,7 @@ class OC_OCSClient{ } $kbe['totalitems'] = $data->meta->totalitems; } - return $kbe; + return $kbe; } |