[Pkg-owncloud-commits] [owncloud] 60/131: Prefer OCS Id from database

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.1.1
in repository owncloud.

commit 289fd99333a203e10ebbf35e633b1d0d22c53b75
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Fri Jul 17 08:31:42 2015 +0200

    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.
---
 lib/private/app.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/private/app.php b/lib/private/app.php
index e45d9ac..5ce64f2 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -659,6 +659,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;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git