[Pkg-owncloud-commits] [owncloud] 77/86: Properly handle enforce home folder naming rule setting

[David Prévot]

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

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

commit f43e1687f8f1a1a3489bf6d73a8d25168524daeb
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Dec 15 10:10:53 2015 +0100

    Properly handle enforce home folder naming rule setting
---
 apps/user_ldap/appinfo/update.php | 8 ++++++++
 apps/user_ldap/appinfo/version    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 8ba1247..60e3004 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -21,3 +21,11 @@
 
 OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
 OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');
+
+$installedVersion = \OC::$server->getConfig()->getAppValue('user_ldap', 'installed_version');
+if (
+	version_compare($installedVersion, '0.5.2', '<') || // stable8
+	(version_compare($installedVersion, '0.5.99', '>') && version_compare($installedVersion, '0.6.1.1', '<')) // stable8.1
+) {
+	\OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', false);
+}
\ No newline at end of file
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index ee6cdce..321da53 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.6.1
+0.6.1.1

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