Commit 07e6262f authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4849 (Issues with member directory search)

parent 235c2331

sources/blocks/main_members.php

+2 −2
Original line number Diff line number Diff line
@@ -523,8 +523,8 @@ class Block_main_members 
        }



        $has_active_filter = false;

        foreach (array_keys($_GET) as $key) {

            if (substr($key, 0, strlen($block_id . '_filter_')) == $block_id . '_filter_') {

        foreach ($_GET as $key => $val) {

            if ((substr($key, 0, strlen('filter_' . $block_id)) == 'filter_' . $block_id) && ($val != '')) {

                $has_active_filter = true;

                break;

            }

sources/hooks/systems/symbols/CPF_LIST.php

+5 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class Hook_symbol_CPF_LIST 
                return $cache[$param[0]];

            }



            if (($param[0] == 'm_primary_group|gm_group_id') || ($param[0] == 'm_primary_group') || ($param[0] == 'gm_group_id')) {

            if (($param[0] == 'usergroup') || ($param[0] == 'm_primary_group|gm_group_id') || ($param[0] == 'm_primary_group') || ($param[0] == 'gm_group_id')) {

                $where = '1=1';

                if (has_privilege(get_member(), 'see_hidden_groups')) {

                    $members_groups = $GLOBALS['CNS_DRIVER']->get_members_groups(get_member());
@@ -69,7 +69,11 @@ class Hook_symbol_CPF_LIST 
                    }

                    $value .= strval($m['id']) . '=' . $m['text'];

                }



                $cache[$param[0]] = $value;

                return $value;

            }



            require_code('cns_members');

            $cpf_id = find_cpf_field_id($param[0]);

            if (!is_null($cpf_id)) {

themes/default/templates/CNS_MEMBER_DIRECTORY_SCREEN_FILTER.tpl

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
	{+START,IF_NON_EMPTY,{$CPF_LIST,{NAME}}}

		<select class="wide_field search_option_value" id="filter_{BLOCK_ID*}_{NAME|*}" name="filter_{BLOCK_ID*}_{NAME|*}">

			<option value="">---</option>

			{+START,LOOP,{$CPF_LIST,{LABEL}}}

			{+START,LOOP,{$CPF_LIST,{NAME}}}

				<option{+START,IF,{$AND,{$NEQ,{_loop_key},},{$EQ,{$_GET,filter_{BLOCK_ID}_{NAME|}},{_loop_key}}}} selected="selected"{+END} value="{_loop_key*}">{_loop_var*}</option>

			{+END}

		</select>