Merge remote branch 'kevin/UserForm/Phone-Field' into develop-next

Conflicts:
	include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php

include/ajax.users.php

@@ -73,12 +73,15 @@ class UsersAjaxAPI extends AjaxController {
                     return $this->search($type, $fulltext);
                 }
             } else {
-                $users->filter(Q::any(array(
+                $filter = Q::any(array(
                     'emails__address__contains' => $q,
                     'name__contains' => $q,
                     'org__name__contains' => $q,
-                    'cdata__phone__contains' => $q,
-                )));
+                ));
+                if (UserForm::getInstance()->getField('phone'))
+                    $filter->add(array('cdata__phone__contains' => $q));
+
+                $users->filter($filter);
             }
 
             // Omit already-imported remote users

include/upgrader/streams/core/cce1ba43-e7dfe821.patch.sql

@@ -9,6 +9,11 @@
 ALTER TABLE `%TABLE_PREFIX%faq_category`
     ADD `category_pid` int(10) unsigned DEFAULT NULL AFTER  `category_id`;
 
+-- Phone Field `name` and `flags`
+UPDATE `%TABLE_PREFIX%form_field`
+    SET `flags` = `flags` + 262144
+    WHERE `type` = 'phone' AND `name` = 'phone' AND `form_id` = 1 AND `id` < 10;
+
  -- Finished with patch
 UPDATE `%TABLE_PREFIX%config`
     SET `value` = 'e7dfe82131b906a14f6a13163943855f'