From 7e224cd8272ac3e47dde80f78bc3066c210e5947 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Fri, 6 Dec 2002 18:47:19 +0000 Subject: [PATCH] bug #649641 --- ChangeLog | 5 +++-- main.php3 | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92eb90039..8db75bbd6 100755 --- a/ChangeLog +++ b/ChangeLog @@ -13,8 +13,9 @@ $Source$ was equal to textheight, i added one mm above and below text (hope your tables are not too big not to fit on a page now ;) -2002-12-05 Alexander M. Turek +2002-12-06 Alexander M. Turek * lang/german.inc.php3: Updates. + * main.php3: Fixed bug #649641 (usernames containing '@' character). 2002-12-06 Marc Delisle * lang/*.php3, pdf_schema.php3, pdf_pages.php3, db_details_structure.php3: @@ -2437,4 +2438,4 @@ $Source$ # vim: ft=changelog # vim: expandtab ts=4 sw=4 sts=4 # vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>8&&getline(v\:lnum)!~'^#' -# vim: fdn=1 fdm=expr \ No newline at end of file +# vim: fdn=1 fdm=expr diff --git a/main.php3 b/main.php3 index e81d89dbd..a044b4826 100755 --- a/main.php3 +++ b/main.php3 @@ -75,7 +75,7 @@ if ($server > 0) { $local_query = 'SELECT VERSION() as version, USER() as user'; $res = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, FALSE, ''); $mysql_cur_user_and_host = PMA_mysql_result($res, 0, 'user'); - $mysql_cur_user = substr($mysql_cur_user_and_host, 0, strpos($mysql_cur_user_and_host, '@')); + $mysql_cur_user = substr($mysql_cur_user_and_host, 0, strrpos($mysql_cur_user_and_host, '@')); $full_string = str_replace('%pma_s1%', PMA_mysql_result($res, 0, 'version'), $strMySQLServerProcess); $full_string = str_replace('%pma_s2%', $server_info, $full_string);