diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-03-30 15:58:20 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-04-03 13:21:24 +0200 |
| commit | 0816cf91422346313d44cba5f017125899afbf2d (patch) | |
| tree | a07e2b644f252896f9b271db31009b66f0d0f367 /lib/private/installer.php | |
| parent | a2087f30d1c4b379b9a53a7ba8ef604038d2b8cb (diff) | |
| download | nextcloud-server-0816cf91422346313d44cba5f017125899afbf2d.tar.gz nextcloud-server-0816cf91422346313d44cba5f017125899afbf2d.zip | |
Add experimental applications switch
Allows administrators to disable or enabled experimental applications as well as show the trust level.
Diffstat (limited to 'lib/private/installer.php')
| -rw-r--r-- | lib/private/installer.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/lib/private/installer.php b/lib/private/installer.php index e30344b1b10..41f13f0f5f9 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -222,8 +222,13 @@ class OC_Installer{ * @throws Exception */ public static function updateAppByOCSId($ocsId) { - $appData = OCSClient::getApplication($ocsId); - $download = OCSClient::getApplicationDownload($ocsId, 1); + $ocsClient = new OCSClient( + \OC::$server->getHTTPClientService(), + \OC::$server->getConfig(), + \OC::$server->getLogger() + ); + $appData = $ocsClient->getApplication($ocsId); + $download = $ocsClient->getApplicationDownload($ocsId); if (isset($download['downloadlink']) && trim($download['downloadlink']) !== '') { $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']); @@ -385,8 +390,12 @@ class OC_Installer{ $ocsid=OC_Appconfig::getValue( $app, 'ocsid', ''); if($ocsid<>'') { - - $ocsdata=OCSClient::getApplication($ocsid); + $ocsClient = new OCSClient( + \OC::$server->getHTTPClientService(), + \OC::$server->getConfig(), + \OC::$server->getLogger() + ); + $ocsdata = $ocsClient->getApplication($ocsid); $ocsversion= (string) $ocsdata['version']; $currentversion=OC_App::getAppVersion($app); if (version_compare($ocsversion, $currentversion, '>')) { |