Fix #13141: Incorrect parameters to config_get function

davidhicks · davidhicks · commit 7af2f47a70be · 2011-09-05T21:48:04.000+10:00
Thanks to Todd Whitesel for finding this problem in filter_api.php and
to Roland Becker for providing further assistance.

I have grepped the source code and reviewed all other calls to
config_get to ensure they correctly use parameters. There was one
additional bug discovered in bug_report_page.php.

Conflicts:
	bug_report_page.php
diff --git a/bug_report_page.php b/bug_report_page.php
@@ -100,7 +100,7 @@
 	$t_bug = bug_get( $f_master_bug_id, true );
 
 	# the user can at least update the master bug (needed to add the relationship)...
-	access_ensure_bug_level( config_get( 'update_bug_threshold', null, $t_bug->project_id ), $f_master_bug_id );
+	access_ensure_bug_level( config_get( 'update_bug_threshold', null, null, $t_bug->project_id ), $f_master_bug_id );
 
 	#@@@ (thraxisp) Note that the master bug is cloned into the same project as the master, independent of
 	#       what the current project is set to.
diff --git a/core/filter_api.php b/core/filter_api.php
@@ -4462,7 +4462,7 @@ function filter_db_get_filter( $p_filter_id, $p_user_id = null ) {
 		}
 
 		# check that the user has access to non current filters
-		if(( ALL_PROJECTS <= $row['project_id'] ) && ( !is_blank( $row['name'] ) ) && ( !access_has_project_level( config_get( 'stored_query_use_threshold', $row['project_id'], $t_user_id ) ) ) ) {
+		if(( ALL_PROJECTS <= $row['project_id'] ) && ( !is_blank( $row['name'] ) ) && ( !access_has_project_level( config_get( 'stored_query_use_threshold', null, $t_user_id, $row['project_id'] ) ) ) ) {
 			return null;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -4462,7 +4462,7 @@ function filter_db_get_filter( $p_filter_id, $p_user_id = null ) {`
`4462`	`4462`	`}`
`4463`	`4463`
`4464`	`4464`	`# check that the user has access to non current filters`
`4465`		`- if(( ALL_PROJECTS <= $row['project_id'] ) && ( !is_blank( $row['name'] ) ) && ( !access_has_project_level( config_get( 'stored_query_use_threshold', $row['project_id'], $t_user_id ) ) ) ) {`
	`4465`	`+ if(( ALL_PROJECTS <= $row['project_id'] ) && ( !is_blank( $row['name'] ) ) && ( !access_has_project_level( config_get( 'stored_query_use_threshold', null, $t_user_id, $row['project_id'] ) ) ) ) {`
`4466`	`4466`	`return null;`
`4467`	`4467`	`}`
`4468`	`4468`