diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-07-02 12:37:31 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-07-02 12:37:31 +0200 |
| commit | c7968d202f9d825b41cb79ea23787be6891b2b30 (patch) | |
| tree | 38f401a5b8c3a05fc02f8d6418aca4ea6eefc687 | |
| parent | bfcb8ffeb3bf46963cb002feec07c08643ec9d82 (diff) | |
| parent | b1000364575ac875ac5a3b452b4352ef41772558 (diff) | |
| download | nextcloud-server-c7968d202f9d825b41cb79ea23787be6891b2b30.tar.gz nextcloud-server-c7968d202f9d825b41cb79ea23787be6891b2b30.zip | |
Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
[Master] Delete OCS ID from DB if none is specified
| -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 |
6 files changed, 7 insertions, 5 deletions
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 a918a2aa18d..ee6cdce3c29 100644 --- a/apps/user_ldap/appinfo/version +++ b/apps/user_ldap/appinfo/version @@ -1 +1 @@ -0.6.0 +0.6.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 d5e07ffdbcc..e45d9ac07ba 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -1174,6 +1174,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); |