Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mantisbt/mantisbt
base: 536b4083ef8e
...
head fork: mantisbt/mantisbt
compare: 3a5ee877a2ef
Checking mergeability… Don't worry, you can still create the pull request.
  • 10 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 30, 2013
@rlerdorf rlerdorf icon_api: added missing $t_status_icon_arr
Conflicts:
	library/adodb
	library/phpmailer
132e1d2
@rlerdorf rlerdorf user_api: fix typos and incorrect argument count
It should be $t_last_timestamp_threshold not $c_last_timestamp_threshold
and although it probably would be a good idea to use a seed,
auth_generate_unique_cookie_string() doesn't actually take one.

Conflicts:
	core/user_api.php
	library/adodb
	library/phpmailer
95d4ac3
@rlerdorf rlerdorf Don't try to output result of print_user()
Conflicts:
	library/adodb
	library/phpmailer
ca15c2e
@rlerdorf rlerdorf Fix invocation of print_captcha_input() with too many arguments
Conflicts:
	library/adodb
	library/phpmailer
	signup_page.php
7e25153
@rlerdorf rlerdorf Fix invocation of plugin_pop_current() with wrong number of arguments
Conflicts:
	library/adodb
	library/phpmailer
6dd8ad3
@rlerdorf rlerdorf Fix invocation of db_param() with incorrect number of arguments
Conflicts:
	core/version_api.php
	library/adodb
	library/phpmailer
19c0ab5
@rlerdorf rlerdorf Fix invocation of prepare_version_string() with incorrect number of a…
…rguments

Conflicts:
	bug_view_inc.php
	library/adodb
	library/phpmailer
ac4c089
@rlerdorf rlerdorf Correct invocation of user_pref_get() with incorrect number of arguments
Conflicts:
	library/adodb
	library/phpmailer
7732085
@rlerdorf rlerdorf Fix invocation of user_get_email() with incorrect number of arguments
Conflicts:
	account_page.php
	library/adodb
	library/phpmailer
9a003ee
@rlerdorf rlerdorf Don't try to output return value of print_* functions
These functions don't return anything

Conflicts:
	adm_config_report.php
	library/adodb
	library/phpmailer
	manage_user_page.php
3a5ee87
View
2  account_page.php
@@ -92,7 +92,7 @@
# In case we're using LDAP to get the email address... this will pull out
# that version instead of the one in the DB
-$u_email = user_get_email( $u_id, $u_username );
+$u_email = user_get_email( $u_id );
# If the password is the default password, then prompt user to change it.
$t_reset_password = $u_username == 'administrator' && auth_does_password_match( $u_id, 'root' );
View
2  adm_config_report.php
@@ -491,7 +491,7 @@ function print_option_list_from_array( $p_array, $p_filter_value ) {
<label for="config-value"><span><?php echo lang_get( 'configuration_option_value' ) ?></span></label>
<span class="textarea">
<textarea name="value" cols="80" rows="10"><?php
- echo print_config_value_as_string( $t_edit_type, $t_edit_value, false );
+ print_config_value_as_string( $t_edit_type, $t_edit_value, false );
?></textarea>
</span>
<span class="label-style"></span>
View
2  bug_monitor_list_view_inc.php
@@ -78,7 +78,7 @@
$t_can_delete_others = access_has_bug_level( config_get( 'monitor_delete_others_bug_threshold' ), $f_bug_id );
for ( $i = 0; $i < $num_users; $i++ ) {
echo ($i > 0) ? ', ' : '';
- echo print_user( $t_users[$i] );
+ print_user( $t_users[$i] );
if ( $t_can_delete_others ) {
echo ' [<a class="small" href="' . helper_mantis_url( 'bug_monitor_delete.php' ) . '?bug_id=' . $f_bug_id . '&amp;user_id=' . $t_users[$i] . htmlspecialchars(form_security_param( 'bug_monitor_delete' )) . '">' . lang_get( 'delete_link' ) . '</a>]';
}
View
6 bug_view_inc.php
@@ -126,15 +126,15 @@
$t_version_rows = version_get_all_rows( $t_bug->project_id );
if ( $t_show_product_version ) {
- $t_product_version_string = prepare_version_string( $t_bug->project_id, version_get_id( $t_bug->version, $t_bug->project_id ), $t_version_rows );
+ $t_product_version_string = prepare_version_string( $t_bug->project_id, version_get_id( $t_bug->version, $t_bug->project_id ) );
}
if ( $t_show_target_version ) {
- $t_target_version_string = prepare_version_string( $t_bug->project_id, version_get_id( $t_bug->target_version, $t_bug->project_id) , $t_version_rows );
+ $t_target_version_string = prepare_version_string( $t_bug->project_id, version_get_id( $t_bug->target_version, $t_bug->project_id) );
}
if ( $t_show_fixed_in_version ) {
- $t_fixed_in_version_string = prepare_version_string( $t_bug->project_id, version_get_id( $t_bug->fixed_in_version, $t_bug->project_id ), $t_version_rows );
+ $t_fixed_in_version_string = prepare_version_string( $t_bug->project_id, version_get_id( $t_bug->fixed_in_version, $t_bug->project_id ) );
}
}
View
2  bugnote_view_inc.php
@@ -162,7 +162,7 @@
<span class="bugnote-reporter">
<?php
- echo print_user( $t_bugnote->reporter_id );
+ print_user( $t_bugnote->reporter_id );
?>
<span class="small access-level"><?php
if ( user_exists( $t_bugnote->reporter_id ) ) {
View
2  core/helper_api.php
@@ -325,7 +325,7 @@ function helper_get_current_project() {
$t_project_id = gpc_get_cookie( $t_cookie_name, null );
if( null === $t_project_id ) {
- $t_pref = user_pref_get( auth_get_current_user_id(), ALL_PROJECTS, false );
+ $t_pref = user_pref_get( auth_get_current_user_id(), ALL_PROJECTS );
$t_project_id = $t_pref->default_project;
} else {
$t_project_id = explode( ';', $t_project_id );
View
1  core/icon_api.php
@@ -78,6 +78,7 @@ function print_status_icon( $p_icon ) {
function print_sort_icon( $p_dir, $p_sort_by, $p_field ) {
$t_icon_path = config_get( 'icon_path' );
$t_sort_icon_arr = config_get( 'sort_icon_arr' );
+ $t_status_icon_arr = config_get( 'status_icon_arr' );
if( $p_sort_by != $p_field ) {
return;
View
2  core/plugin_api.php
@@ -616,7 +616,7 @@ function plugin_install( $p_plugin ) {
plugin_push_current( $p_plugin->basename );
if( !$p_plugin->install() ) {
- plugin_pop_current( $p_plugin->basename );
+ plugin_pop_current();
return null;
}
View
2  core/user_api.php
@@ -477,7 +477,7 @@ function user_get_logged_in_user_ids( $p_session_duration_in_minutes ) {
# Execute query
$query = 'SELECT id FROM ' . $t_user_table . ' WHERE last_visit > ' . db_param();
- $result = db_query_bound( $query, array( $c_last_timestamp_threshold ), 1 );
+ $result = db_query_bound( $query, array( $t_last_timestamp_threshold ), 1 );
# Get the list of connected users
$t_users_connected = array();
View
11 core/version_api.php
@@ -478,8 +478,6 @@ function version_get_all_rows( $p_project_id, $p_released = null, $p_obsolete =
$t_project_version_table = db_get_table( 'project_version' );
- $t_param_count = 0;
-
$t_project_where = version_get_project_where_clause( $p_project_id, $p_inherit );
$query = "SELECT *
@@ -490,13 +488,13 @@ function version_get_all_rows( $p_project_id, $p_released = null, $p_obsolete =
if( $p_released !== null ) {
$c_released = db_prepare_int( $p_released );
- $query .= " AND released = " . db_param( $t_param_count++ );
+ $query .= " AND released = " . db_param();
$query_params[] = $c_released;
}
if( $p_obsolete !== null ) {
$c_obsolete = db_prepare_bool( $p_obsolete );
- $query .= " AND obsolete = " . db_param( $t_param_count++ );
+ $query .= " AND obsolete = " . db_param();
$query_params[] = $c_obsolete;
}
@@ -522,21 +520,20 @@ function version_get_all_rows( $p_project_id, $p_released = null, $p_obsolete =
function version_get_all_rows_with_subs( $p_project_id, $p_released = null, $p_obsolete = false ) {
$t_project_where = helper_project_specific_where( $p_project_id );
- $t_param_count = 0;
$t_query_params = array();
if( $p_released === null ) {
$t_released_where = '';
} else {
$c_released = (int)$p_released;
- $t_released_where = "AND ( released = " . db_param( $t_param_count++ ) . " )";
+ $t_released_where = "AND ( released = " . db_param() . " )";
$t_query_params[] = $c_released;
}
if( $p_obsolete === null ) {
$t_obsolete_where = '';
} else {
- $t_obsolete_where = "AND ( obsolete = " . db_param( $t_param_count++ ) . " )";
+ $t_obsolete_where = "AND ( obsolete = " . db_param() . " )";
$t_query_params[] = $p_obsolete;
}
View
2  manage_user_page.php
@@ -259,7 +259,7 @@
<div id="manage-user-div" class="form-container">
<h2><?php echo lang_get( 'manage_accounts_title' ) ?></h2> [<?php echo $t_total_user_count ?>]
<?php print_button( 'manage_user_create_page.php', lang_get( 'create_new_account_link' ) ) ?>
- <?php if ( $f_filter === 'UNUSED' ) echo print_button( 'manage_user_prune.php', lang_get( 'prune_accounts' ) ); ?>
+ <?php if ( $f_filter === 'UNUSED' ) print_button( 'manage_user_prune.php', lang_get( 'prune_accounts' ) ); ?>
<form id="manage-user-filter" method="post" action="manage_user_page.php">
<fieldset>
<?php # CSRF protection not required here - form does not result in modifications ?>
View
2  print_bugnote_inc.php
@@ -130,7 +130,7 @@
<tr>
<td class="print">
<?php
- echo print_user( $v3_reporter_id );
+ print_user( $v3_reporter_id );
?>&#160;&#160;&#160;
</td>
</tr>
View
2  signup_page.php
@@ -95,7 +95,7 @@
echo '<div class="field-container">';
echo '<label for="captcha-field"><span>' . lang_get( 'signup_captcha_request_label' ) . '</span></label>';
echo '<span id="captcha-input" class="input">';
- print_captcha_input( 'captcha', '' );
+ print_captcha_input( 'captcha' );
echo '<span class="captcha-image"><img src="library/securimage/securimage_show.php" alt="visual captcha" /></span>';
echo ' <object type="application/x-shockwave-flash" data="library/securimage/securimage_play.swf?audio_file=library/securimage/securimage_play.php&amp;bgColor1=#fff&amp;bgColor2=#fff&amp;iconColor=#777&amp;borderWidth=1&amp;borderColor=#000" width="19" height="19">
<param name="movie" value="library/securimage/securimage_play.swf?audio_file=library/securimage/securimage_play.php&amp;bgColor1=#fff&amp;bgColor2=#fff&amp;iconColor=#777&amp;borderWidth=1&amp;borderColor=#000" />

No commit comments for this range

Something went wrong with that request. Please try again.