[Pkg-owncloud-commits] [owncloud] 03/13: Delete OCS ID from DB if none is specified

[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 6170aa5cc3820ed831a82076cf2dbfc8c10b8f5c
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Thu Jul 2 09:16:00 2015 +0200

    Delete OCS ID from DB if none is specified
    
    If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value.
    
    Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
---
 lib/private/app.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/app.php b/lib/private/app.php
index 05842ed..e885f9e 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -1201,6 +1201,8 @@ class OC_App {
 		$appData = self::getAppInfo($appId);
 		if (array_key_exists('ocsid', $appData)) {
 			OC_Appconfig::setValue($appId, 'ocsid', $appData['ocsid']);
+		} elseif(OC_Appconfig::getValue($appId, 'ocsid', null) !== null) {
+			OC_Appconfig::deleteKey($appId, 'ocsid');
 		}
 		foreach ($appData['remote'] as $name => $path) {
 			OCP\CONFIG::setAppValue('core', 'remote_' . $name, $appId . '/' . $path);

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