diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-07-02 15:39:29 +0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-02 15:39:29 +0300 |
| commit | 229635d65a6192bee6a1d56bc9fa3d287aa05c0b (patch) | |
| tree | 1207d0c0bb6cba276b5af68474f1c4f60bfa2fcc | |
| parent | 6029b4176002391c4702fc77d3e4e766d664e52c (diff) | |
| parent | bbd6f42c70684715b5a482d5ba938d8e7b902bbb (diff) | |
Merge pull request #17318 from owncloud/stable8-clean-ocsid
[stable8] 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 39e898a4f95..7486fdbc50b 100644 --- a/apps/files_encryption/appinfo/version +++ b/apps/files_encryption/appinfo/version @@ -1 +1 @@ -0.7.1 +0.7.2 diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version index ee6cdce3c29..b6160487433 100644 --- a/apps/files_sharing/appinfo/version +++ b/apps/files_sharing/appinfo/version @@ -1 +1 @@ -0.6.1 +0.6.2 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 8f0916f768f..4b9fcbec101 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.5.0 +0.5.1 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 6c38cdb8223..6f0abf58e17 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -1173,6 +1173,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); |