[mantisbt-commits] mantisbt.git branch, master-1.2.x, updated. release-1.2.3-39-g712ce66

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

The branch, master-1.2.x has been updated
       via  712ce66721303038e3ba0afe4a56afa2f95fb51f (commit)
      from  0bf8b4f6b0607b423e14e0e20e68660d781df8fe (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 712ce66721303038e3ba0afe4a56afa2f95fb51f
Author: Damien Regad <dam...@me...>
Date:   Tue Nov 2 13:33:17 2010 +0100

    Fix #12504: Error in Edit User page when queried by LDAP username
    
    Use $t_user_id instead of $f_user_id variable, as the latter is not initialized when the user is identified by their username instead of id.
    
    Also removed useless assignment of $f_user_id, as the variable is not referenced anymore.
    
    Signed-off-by: David Hicks <hic...@op...>

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

Summary of changes:
 manage_user_edit_page.php |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

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

commit 712ce66721303038e3ba0afe4a56afa2f95fb51f
Author: Damien Regad <dam...@me...>
Date:   Tue Nov 2 13:33:17 2010 +0100

    Fix #12504: Error in Edit User page when queried by LDAP username
    
    Use $t_user_id instead of $f_user_id variable, as the latter is not initialized when the user is identified by their username instead of id.
    
    Also removed useless assignment of $f_user_id, as the variable is not referenced anymore.
    
    Signed-off-by: David Hicks <hic...@op...>

diff --git a/manage_user_edit_page.php b/manage_user_edit_page.php
index b0dd092..11f89f0 100644
--- a/manage_user_edit_page.php
+++ b/manage_user_edit_page.php
@@ -32,8 +32,7 @@
 	$f_username = gpc_get_string( 'username', '' );
 
 	if ( is_blank( $f_username ) ) {
-		$f_user_id = gpc_get_int( 'user_id' );
-		$t_user_id = $f_user_id;
+		$t_user_id = gpc_get_int( 'user_id' );
 	} else {
 		$t_user_id = user_get_id_by_name( $f_username );
 		if ( $t_user_id === false ) {
@@ -90,7 +89,7 @@
 		<?php
 			// With LDAP
 			if ( $t_ldap && ON == config_get( 'use_ldap_realname' ) ) {
-				echo string_display_line( user_get_realname( $f_user_id ) );
+				echo string_display_line( user_get_realname( $t_user_id ) );
 			}
 			// Without LDAP
 			else {
@@ -111,7 +110,7 @@
 		<?php
 			// With LDAP
 			if ( $t_ldap && ON == config_get( 'use_ldap_email' ) ) {
-				echo string_display_line( user_get_email( $f_user_id ) );
+				echo string_display_line( user_get_email( $t_user_id ) );
 			}
 			// Without LDAP
 			else {

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


--
Mantis Bug Tracker