summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib/wizard.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-06-25 19:38:54 +0200
committerArthur Schiwon <blizzz@owncloud.com>2014-08-29 11:14:36 +0200
commit371cab367d2b786c0fadb3a76daeb3ba9138e164 (patch)
tree6079217db38894d2581d84a8e3c49ff918e041a4 /apps/user_ldap/lib/wizard.php
parent6958033db9f6bd2ff7e69b05a6cb064206957a65 (diff)
downloadnextcloud-server-371cab367d2b786c0fadb3a76daeb3ba9138e164.tar.gz
nextcloud-server-371cab367d2b786c0fadb3a76daeb3ba9138e164.zip
trigger email detection by Wizard upon any user filter filter change. before it happenend only upon user automatic list filter creation, but not on manual editing
Diffstat (limited to 'apps/user_ldap/lib/wizard.php')
-rw-r--r--apps/user_ldap/lib/wizard.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 8e6e47b1f6b..4118b45bc35 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -155,7 +155,7 @@ class Wizard extends LDAPUtility {
* detects the most often used email attribute for users applying to the
* user list filter. If a setting is already present that returns at least
* one hit, the detection will be canceled.
- * @return bool|string
+ * @return WizardResult|bool
*/
public function detectEmailAttribute() {
if(!$this->checkRequirements(array('ldapHost',
@@ -197,7 +197,7 @@ class Wizard extends LDAPUtility {
}
}
- return $winner;
+ return $this->result;
}
/**
@@ -820,7 +820,6 @@ class Wizard extends LDAPUtility {
if(empty($filter)) {
$filter = '(objectclass=*)';
}
- $this->detectEmailAttribute();
break;
case self::LFILTER_GROUP_LIST: