diff options
| author | David Colón <david@davidiq.com> | 2012-06-26 00:37:48 -0400 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-15 23:29:01 -0600 |
| commit | babe07caefe8a035f711fd76c38b4dbeb0a8e804 (patch) | |
| tree | c7715b2a01240600c3f80405cb5ca6a0ffed193d /phpBB/memberlist.php | |
| parent | de541ac13b44d1f52e1ba4bb626b9ec4e124557f (diff) | |
| download | forums-babe07caefe8a035f711fd76c38b4dbeb0a8e804.tar forums-babe07caefe8a035f711fd76c38b4dbeb0a8e804.tar.gz forums-babe07caefe8a035f711fd76c38b4dbeb0a8e804.tar.bz2 forums-babe07caefe8a035f711fd76c38b4dbeb0a8e804.tar.xz forums-babe07caefe8a035f711fd76c38b4dbeb0a8e804.zip | |
[ticket/10786] Javascript toggle member search panel in memberlist.php
Search functions on the memberlist.php page are now rendered by default and displayed via javascript. If javascript is disabled the page still works as it previously did.
PHPBB3-10786
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 681e51e3fd..ebc1757810 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1025,7 +1025,7 @@ switch ($mode) // We validate form and field here, only id/class allowed $form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form; $field = (!preg_match('/^[a-z0-9_-]+$/i', $field)) ? '' : $field; - if ((in_array($mode, array('', 'searchuser')) || sizeof(array_intersect($request->variable_names(phpbb_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_'))) + if ((($mode == '' || $mode == 'searchuser') || sizeof(array_intersect($request->variable_names(phpbb_request_interface::GET), $search_params)) > 0) && ($config['load_search'] || $auth->acl_get('a_'))) { $username = request_var('username', '', true); $email = strtolower(request_var('email', '')); @@ -1377,7 +1377,7 @@ switch ($mode) } // Some search user specific data - if (in_array($mode, array('', 'searchuser')) && ($config['load_search'] || $auth->acl_get('a_'))) + if (($mode == '' || $mode == 'searchuser') && ($config['load_search'] || $auth->acl_get('a_'))) { $group_selected = request_var('search_group_id', 0); $s_group_select = '<option value="0"' . ((!$group_selected) ? ' selected="selected"' : '') . '> </option>'; @@ -1447,7 +1447,7 @@ switch ($mode) 'S_IP_SEARCH_ALLOWED' => ($auth->acl_getf_global('m_info')) ? true : false, 'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false, 'S_IN_SEARCH_POPUP' => ($form && $field) ? true : false, - 'S_SEARCH_USER' => ($mode == 'searchuser' || ($mode == '' && $submit)) ? true : false, + 'S_SEARCH_USER' => ($mode == 'searchuser' || ($mode == '' && $submit)), 'S_FORM_NAME' => $form, 'S_FIELD_NAME' => $field, 'S_SELECT_SINGLE' => $select_single, |