diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-07-02 14:39:43 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-02 14:39:43 +0200 |
| commit | 065bcf4790b30a027051ba34a4af129158fb5e93 (patch) | |
| tree | 8edabeb1fe48aaf282dbfa3934ab551feaaa3862 | |
| parent | d8f88aa413f92a5209bdd7727f564fee67bb296a (diff) | |
| parent | a1da45a172ca2a16aeef24a45cb409e8554c45b9 (diff) | |
| download | nextcloud-server-065bcf4790b30a027051ba34a4af129158fb5e93.tar.gz nextcloud-server-065bcf4790b30a027051ba34a4af129158fb5e93.zip | |
Merge pull request #17319 from owncloud/stable7-clean-ocsid
[stable7] Delete OCS ID from DB if none is specified
| -rw-r--r-- | apps/files_encryption/appinfo/version | 2 | ||||
| -rw-r--r-- | apps/files_sharing/appinfo/version | 2 | ||||
| -rw-r--r-- | apps/files_trashbin/appinfo/version | 2 | ||||
| -rw-r--r-- | apps/files_versions/appinfo/version | 2 | ||||
| -rw-r--r-- | apps/user_ldap/appinfo/version | 2 | ||||
| -rw-r--r-- | apps/user_webdavauth/appinfo/version | 2 | ||||
| -rw-r--r-- | lib/private/app.php | 2 |
7 files changed, 8 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 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); |