Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9db6eb14a4d1
Choose a base ref
...
head repository: mantisbt/mantisbt
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e843371a9a37
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 24, 2012

  1. Fix #14735: Permalink does not work when using "Match Type"

    @rombert
    rombert committed Sep 24, 2012
    Copy the full SHA
    cc60613 View commit details

  2. Merge branch 'master-1.2.x' of git@github.com:mantisbt/mantisbt.git i… 

    …nto master-1.2.x
    @rombert
    rombert committed Sep 24, 2012
    Copy the full SHA
    e843371 View commit details
Showing with 4 additions and 0 deletions.
  1. +1 −0 config_filter_defaults_inc.php
  2. +2 −0 core/filter_api.php
  3. +1 −0 search.php
1 change: 1 addition & 0 deletions config_filter_defaults_inc.php
View file
Original file line number Diff line number Diff line change
@@ -107,4 +107,5 @@
define( 'FILTER_SEARCH_RELATIONSHIP_BUG', 'relationship_bug' );
define( 'FILTER_SEARCH_TAG_STRING', 'tag_string' );
define( 'FILTER_SEARCH_TAG_SELECT', 'tag_select' );
define( 'FILTER_SEARCH_MATCH_TYPE', 'match_type');

2 changes: 2 additions & 0 deletions core/filter_api.php
View file
Original file line number Diff line number Diff line change
@@ -253,6 +253,8 @@ function filter_get_url( $p_custom_filter ) {
$t_query[] = filter_encode_field_and_value( FILTER_SEARCH_TAG_SELECT, $p_custom_filter[FILTER_PROPERTY_TAG_SELECT] );
}

$t_query[] = filter_encode_field_and_value( FILTER_SEARCH_MATCH_TYPE, $p_custom_filter[FILTER_PROPERTY_MATCH_TYPE] );

if( isset( $p_custom_filter['custom_fields'] ) ) {
foreach( $p_custom_filter['custom_fields'] as $t_custom_field_id => $t_custom_field_values ) {
if( !filter_field_is_any( $t_custom_field_values ) ) {
1 change: 1 addition & 0 deletions search.php
View file
Original file line number Diff line number Diff line change
@@ -73,6 +73,7 @@
$my_filter[FILTER_PROPERTY_OS_BUILD] = gpc_get_string_array( FILTER_SEARCH_OS_BUILD, META_FILTER_ANY );
$my_filter[FILTER_PROPERTY_VIEW_STATE_ID] = gpc_get_string_array( FILTER_SEARCH_VIEW_STATE_ID, META_FILTER_ANY );
$my_filter[FILTER_PROPERTY_PRODUCT_VERSION] = gpc_get_string_array( FILTER_SEARCH_PRODUCT_VERSION, META_FILTER_ANY );
$my_filter[FILTER_PROPERTY_MATCH_TYPE] = gpc_get_string ( FILTER_SEARCH_MATCH_TYPE, FILTER_MATCH_ALL );

// Filtering by Date
$my_filter[FILTER_PROPERTY_FILTER_BY_DATE] = gpc_get_bool( FILTER_SEARCH_FILTER_BY_DATE );