From 6170aa5cc3820ed831a82076cf2dbfc8c10b8f5c Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 2 Jul 2015 09:16:00 +0200
Subject: 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 05842ed18ab..e885f9e002a 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);
-- 
cgit v1.2.3


From a1da45a172ca2a16aeef24a45cb409e8554c45b9 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 2 Jul 2015 09:18:41 +0200
Subject: Bump versions

---
 apps/files_encryption/appinfo/version | 2 +-
 apps/files_sharing/appinfo/version    | 2 +-
 apps/files_trashbin/appinfo/version   | 2 +-
 apps/files_versions/appinfo/version   | 2 +-
 apps/user_ldap/appinfo/version        | 2 +-
 apps/user_webdavauth/appinfo/version  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version
index ee6cdce3c29..b6160487433 100644
--- a/apps/files_encryption/appinfo/version
+++ b/apps/files_encryption/appinfo/version
@@ -1 +1 @@
-0.6.1
+0.6.2
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index be14282b7ff..7d8568351b4 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.5.3
+0.5.4
diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version
index b6160487433..844f6a91acb 100644
--- a/apps/files_trashbin/appinfo/version
+++ b/apps/files_trashbin/appinfo/version
@@ -1 +1 @@
-0.6.2
+0.6.3
diff --git a/apps/files_versions/appinfo/version b/apps/files_versions/appinfo/version
index 90a27f9cea6..af0b7ddbffd 100644
--- a/apps/files_versions/appinfo/version
+++ b/apps/files_versions/appinfo/version
@@ -1 +1 @@
-1.0.5
+1.0.6
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 0bfccb08040..ef52a648073 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.4.5
+0.4.6
diff --git a/apps/user_webdavauth/appinfo/version b/apps/user_webdavauth/appinfo/version
index 238afc2b279..a3fdef3af89 100644
--- a/apps/user_webdavauth/appinfo/version
+++ b/apps/user_webdavauth/appinfo/version
@@ -1 +1 @@
-1.1.0.1
+1.1.0.2
-- 
cgit v1.2.3