diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-03-11 11:28:28 +0100 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-03-11 11:28:28 +0100 |
| commit | abb726c994058ad0e962be87d82d788a1edae901 (patch) | |
| tree | 6af655cb15bc2ae45482ff07f226428b6a10bef9 /lib/private | |
| parent | 3df1d9338edd3be385e3d607ce8476e3fb6bb241 (diff) | |
| parent | ffe06ac5c727913e5bff225a1c485e504a287e64 (diff) | |
| download | nextcloud-server-abb726c994058ad0e962be87d82d788a1edae901.tar.gz nextcloud-server-abb726c994058ad0e962be87d82d788a1edae901.zip | |
Merge pull request #14789 from owncloud/better-app-install-error-messages
display app update error messages
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/installer.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/private/installer.php b/lib/private/installer.php index 087bc6c1edb..3956e503767 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -202,20 +202,21 @@ class OC_Installer{ /** * update an app by it's id - * @param integer $ocsid + * + * @param integer $ocsId * @return bool * @throws Exception */ - public static function updateAppByOCSId($ocsid) { - $appdata = OCSClient::getApplication($ocsid); - $download = OCSClient::getApplicationDownload($ocsid, 1); + public static function updateAppByOCSId($ocsId) { + $appData = OCSClient::getApplication($ocsId); + $download = OCSClient::getApplicationDownload($ocsId, 1); if (isset($download['downloadlink']) && trim($download['downloadlink']) !== '') { $download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']); $info = array( 'source' => 'http', 'href' => $download['downloadlink'], - 'appdata' => $appdata + 'appdata' => $appData ); } else { throw new \Exception('Could not fetch app info!'); @@ -285,7 +286,7 @@ class OC_Installer{ * @return array * @throws \Exception */ - public static function checkAppsIntegrity($data = array(), $extractDir, $path, $isShipped=false) { + public static function checkAppsIntegrity($data, $extractDir, $path, $isShipped=false) { $l = \OC::$server->getL10N('lib'); //load the info.xml file of the app if(!is_file($extractDir.'/appinfo/info.xml')) { |