[mantisbt-commits] mantisbt.git branch, master-1.2.x, updated. release-1.2.1-5-g3b1a5b8

[<gi...@ma...>]

The branch, master-1.2.x has been updated
       via  3b1a5b87e2b25296c0156409aafd283b6d81700f (commit)
      from  2f0fd38df55bd0eede605b3178f5efe21233cb2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b1a5b87e2b25296c0156409aafd283b6d81700f
Author: David Hicks <hic...@op...>
Date:   Thu Apr 29 15:44:02 2010 +1000

    Fix #11764: Avoid collision of column names when ordering fields
    
    When filtering issues, the ORDER BY clause doesn't distuingish between
    custom fields and built-in fields. Thus it is possible for a custom
    field named "id" to collide with the built-in bug "id" field when
    creating the ORDER BY clause.

-----------------------------------------------------------------------

Summary of changes:
 core/filter_api.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------

commit 3b1a5b87e2b25296c0156409aafd283b6d81700f
Author: David Hicks <hic...@op...>
Date:   Thu Apr 29 15:44:02 2010 +1000

    Fix #11764: Avoid collision of column names when ordering fields
    
    When filtering issues, the ORDER BY clause doesn't distuingish between
    custom fields and built-in fields. Thus it is possible for a custom
    field named "id" to collide with the built-in bug "id" field when
    creating the ORDER BY clause.

diff --git a/core/filter_api.php b/core/filter_api.php
index 2925266..6b499a3 100644
--- a/core/filter_api.php
+++ b/core/filter_api.php
@@ -902,7 +902,7 @@ function filter_get_query_sort_data( &$p_filter, $p_show_sticky, $p_query_clause
 	$t_plugin_columns = columns_get_plugin_columns();
 
 	if ( gpc_string_to_bool( $p_filter[FILTER_PROPERTY_SHOW_STICKY_ISSUES] ) && ( NULL !== $p_show_sticky ) ) {
-		$p_query_clauses['order'][] = "sticky DESC";
+		$p_query_clauses['order'][] = "$t_bug_table.sticky DESC";
 	}
 
 	$t_count = count( $t_sort_fields );
@@ -927,7 +927,7 @@ function filter_get_query_sort_data( &$p_filter, $p_show_sticky, $p_query_clause
 					$p_query_clauses['join'][] = "LEFT JOIN $t_custom_field_string_table $t_cf_table_alias ON $t_bug_table.id  = $t_cf_table_alias.bug_id AND $t_cf_table_alias.field_id = $t_custom_field_id";
 				}
 
-				$p_query_clauses['order'][] = $c_cf_alias . ' ' . $c_dir;
+				$p_query_clauses['order'][] = "$c_cf_alias $c_dir";
 
 			# if sorting by plugin columns
 			} else if ( isset( $t_plugin_columns[ $t_sort_fields[$i] ] ) ) {
@@ -949,9 +949,9 @@ function filter_get_query_sort_data( &$p_filter, $p_show_sticky, $p_query_clause
 			# standard column
 			} else {
 				if ( 'last_updated' == $c_sort ) {
-					$c_sort = "$t_bug_table.last_updated";
+					$c_sort = "last_updated";
 				}
-				$p_query_clauses['order'][] = $c_sort . ' ' . $c_dir;
+				$p_query_clauses['order'][] = "$t_bug_table.$c_sort $c_dir";
 			}
 		}
 	}
@@ -961,7 +961,7 @@ function filter_get_query_sort_data( &$p_filter, $p_show_sticky, $p_query_clause
 		$p_query_clauses['order'][] = "$t_bug_table.last_updated DESC";
 	}
 	if( !in_array( 'date_submitted', $t_sort_fields ) ) {
-		$p_query_clauses['order'][] = $t_bug_table . '.date_submitted DESC';
+		$p_query_clauses['order'][] = "$t_bug_table.date_submitted DESC";
 	}
 
 	return $p_query_clauses;

-----------------------------------------------------------------------


--
Mantis Bug Tracker