summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-12-15 10:10:53 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-12-15 10:10:53 +0100
commitf43e1687f8f1a1a3489bf6d73a8d25168524daeb (patch)
treecd65a742c17eea1ee97c1c0755c06d2f134fdb00 /apps
parentb6caf413876ade56695a1b3cbd6381d1b89edcc5 (diff)
downloadnextcloud-server-f43e1687f8f1a1a3489bf6d73a8d25168524daeb.tar.gz
nextcloud-server-f43e1687f8f1a1a3489bf6d73a8d25168524daeb.zip
Properly handle enforce home folder naming rule setting
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/appinfo/update.php8
-rw-r--r--apps/user_ldap/appinfo/version2
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 8ba12478673..60e300467ab 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 ee6cdce3c29..321da530e66 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.6.1
+0.6.1.1