CRM-17422: Backport #7007 to 4.6

[omarabuhussein]

Backporting #7007 to 4.6

---

• CRM-17422: Change in custom field search behaviour impacting on performance

[omarabuhussein]

@monishdeb @eileenmcnaughton I tagged you guys since you are originally discussed the issue on #7007 .. what do you think ?

[eileenmcnaughton]

If it backported cleanly & you have tested against 4.6 I'm happy to merge it

[monishdeb]

yup like @eileenmcnaughton said, if the backport patch fixes the original issue CRM-17422 then its ready to merge. @omarabuhussein have you tested the fix on 4.6 latest ?

[omarabuhussein]

thanks guys ,, I didn't really tested it on latest 4.6 but on a bit older one ... will test again on latest 4.6 and then compare the changes with current code on master and let you know

[colemanw]

@omarabuhussein have you tested this yet?

[omarabuhussein]

@colemanw Yes and it work .. but there are many changes happened in this part of code in 4.7 so I want to trace the commit history and try to make the code similar as much as possible to the current code in 4.7 ... I also working on fixing a case where custom field type is a multi select box so this can wait a bit.

[colemanw]

Ok, lets reopen this when you're ready.