[Pkg-owncloud-commits] [owncloud] 97/107: properly preserve home folder naming enforcement setting

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 5ac6cacd901ed50510b202aead575c51e9253bdb
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Dec 15 10:23:50 2015 +0100

    properly preserve home folder naming enforcement setting
---
 apps/user_ldap/appinfo/info.xml   | 2 +-
 apps/user_ldap/appinfo/update.php | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index d7e2bc4..0932aa4 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -10,7 +10,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
 	<licence>AGPL</licence>
 	<author>Dominik Schmidt and Arthur Schiwon</author>
 	<shipped>true</shipped>
-	<version>0.7.0</version>
+	<version>0.7.1</version>
 	<types>
 		<authentication/>
 	</types>
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 7d358e5..f0dfc2c 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -23,7 +23,12 @@
 
 $installedVersion = \OC::$server->getConfig()->getAppValue('user_ldap', 'installed_version');
 
-if (version_compare($installedVersion, '0.6.1', '<')) {
+
+if (
+	version_compare($installedVersion, '0.5.2', '<') || // stable8
+	(version_compare($installedVersion, '0.5.99', '>') && version_compare($installedVersion, '0.6.1.1', '<')) || // stable8.1
+	(version_compare($installedVersion, '0.6.99', '>') && version_compare($installedVersion, '0.7.1', '<')) // stable8.2
+) {
 	\OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', false);
 }
 

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