Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified

[Master] Delete OCS ID from DB if none is specified
This commit is contained in:
Joas Schilling 2015-07-02 12:37:31 +02:00
commit c7968d202f
6 changed files with 7 additions and 5 deletions

View File

@ -1 +1 @@
0.6.1
0.6.2

View File

@ -1 +1 @@
0.6.2
0.6.3

View File

@ -1 +1 @@
1.0.5
1.0.6

View File

@ -1 +1 @@
0.6.0
0.6.1

View File

@ -1 +1 @@
1.1.0.1
1.1.0.2

View File

@ -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);