[Pkg-owncloud-commits] [owncloud] 32/258: Remove different URL for EE

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 65343041965dc9a392dfa6acf5812331d44b4489
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Sun Aug 24 20:22:15 2014 +0200

    Remove different URL for EE
    
    This can now be achieved by setting `appstoreenabled` to `false` in config.php
---
 lib/private/ocsclient.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index e4cce6b..d173f39 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -36,13 +36,7 @@ class OC_OCSClient{
 	 * to set it in the config file or it will fallback to the default
 	 */
 	private static function getAppStoreURL() {
-		if(OC_Util::getEditionString()===''){
-			$default='https://api.owncloud.com/v1';
-		}else{
-			$default='';
-		}
-		$url = OC_Config::getValue('appstoreurl', $default);
-		return($url);
+		return \OC::$server->getConfig()->getSystemValue('appstoreurl', 'https://api.owncloud.com/v1');
 	}
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git