diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-07-17 08:31:42 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-09-18 13:27:26 +0200 |
| commit | 7c6d811584338835f9f4fd563780933ecd638356 (patch) | |
| tree | ed904eb20090cf632ecf4049b2fbc4d9618a3972 /lib | |
| parent | 947e3d7ab5921d4175dc8a1e30fe35025e714926 (diff) | |
| download | nextcloud-server-7c6d811584338835f9f4fd563780933ecd638356.tar.gz nextcloud-server-7c6d811584338835f9f4fd563780933ecd638356.zip | |
Prefer OCS Id from database
To be consistent with other logic the app id from the database needs to be prefered. Especially when it comes to be able to replace an outdated OCS id.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/app.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index e44290369a8..6c9f7615228 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -656,6 +656,12 @@ class OC_App { if (is_array($data)) { $data = OC_App::parseAppInfo($data); } + if(isset($data['ocsid'])) { + $storedId = \OC::$server->getConfig()->getAppValue($appId, 'ocsid'); + if($storedId !== '' && $storedId !== $data['ocsid']) { + $data['ocsid'] = $storedId; + } + } self::$appInfo[$appId] = $data; |