diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-12-15 18:42:00 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-12-15 18:42:00 +0100 |
| commit | 36701a28657efdd8bb9d7b7b56b42d6a2fd3d20c (patch) | |
| tree | 31aec79aef7253e111397a5c4205b0243f4e0894 | |
| parent | 9154c5d8f45c92ce88fb4c3de00e7fc3d24be50c (diff) | |
| parent | 5ac6cacd901ed50510b202aead575c51e9253bdb (diff) | |
| download | nextcloud-server-36701a28657efdd8bb9d7b7b56b42d6a2fd3d20c.tar.gz nextcloud-server-36701a28657efdd8bb9d7b7b56b42d6a2fd3d20c.zip | |
Merge pull request #21211 from owncloud/stable8.2-handle-enforce-home-folder-rule-setting
[stable8.2] properly preserve home folder naming enforcement setting
| -rw-r--r-- | apps/user_ldap/appinfo/info.xml | 2 | ||||
| -rw-r--r-- | 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 d7e2bc4087c..0932aa41dae 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 7d358e5b268..f0dfc2c8f71 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); } |