From 9aef83b5798733d718e03a4ef0edc7279db43e59 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 22 Nov 2014 00:51:41 +0100
Subject: [PATCH] make scrutinizer happier and always count users on assisted
 mode, even with xp'ed mode (would be a regression otherwise)

---
 apps/user_ldap/js/ldapFilter.js | 4 ++--
 apps/user_ldap/js/settings.js   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 4fe8e4aebd..0f7d240ada 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -26,10 +26,10 @@ LdapFilter.prototype.activate = function() {
 	this.determineMode();
 };
 
-LdapFilter.prototype.compose = function(updateCount = false) {
+LdapFilter.prototype.compose = function(updateCount) {
 	var action;
 
-	if(updateCount) {
+	if(updateCount === true) {
 		this.countPending = updateCount;
 	}
 
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 9987f6fd01..6db210fe43 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -812,7 +812,7 @@ var LdapWizard = {
 		LdapWizard._save($('#'+originalObj)[0], $.trim(values));
 		if(originalObj === 'ldap_userfilter_objectclass'
 		   || originalObj === 'ldap_userfilter_groups') {
-			LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced());
+			LdapWizard.userFilter.compose(true);
 			//when user filter is changed afterwards, login filter needs to
 			//be adjusted, too
 			if(!LdapWizard.loginFilter) {
@@ -823,7 +823,7 @@ var LdapWizard = {
 			LdapWizard.loginFilter.compose();
 		} else if(originalObj === 'ldap_groupfilter_objectclass'
 		   || originalObj === 'ldap_groupfilter_groups') {
-			LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced());
+			LdapWizard.groupFilter.compose(true);
 		}
 	},
 
@@ -893,10 +893,10 @@ var LdapWizard = {
 			LdapWizard._save({ id: modeKey }, LdapWizard.filterModeAssisted);
 			if(isUser) {
 				LdapWizard.blacklistRemove('ldap_userlist_filter');
-				LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced());
+				LdapWizard.userFilter.compose(true);
 			} else {
 				LdapWizard.blacklistRemove('ldap_group_filter');
-				LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced());
+				LdapWizard.groupFilter.compose(true);
 			}
 		}
 	},