Skip to content

bugzilla
bugzilla
Commit 70d77267 authored by cyeh%bluemartini.com's avatar cyeh%bluemartini.com
Browse files
Options

fix warnings on DBID_to_real_or_loginname. thanks to endico@mozilla.org

parent 6768b59c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
globals.pl
View file @ 70d77267
...@@ -550,7 +550,7 @@ sub DBID_to_real_or_loginname { ...@@ -550,7 +550,7 @@ sub DBID_to_real_or_loginname {
my ($id) = (@_); my ($id) = (@_);
SendSQL("SELECT login_name,realname FROM profiles WHERE userid = $id"); SendSQL("SELECT login_name,realname FROM profiles WHERE userid = $id");
my ($l, $r) = FetchSQLData(); my ($l, $r) = FetchSQLData();
if ($r eq "") { if (!defined $r || $r eq "") {
return $l; return $l;
} else { } else {
return "$l ($r)"; return "$l ($r)";
...@@ -562,7 +562,7 @@ sub DBID_to_name { ...@@ -562,7 +562,7 @@ sub DBID_to_name {
if (!defined $::cachedNameArray{$id}) { if (!defined $::cachedNameArray{$id}) {
SendSQL("select login_name from profiles where userid = $id"); SendSQL("select login_name from profiles where userid = $id");
my $r = FetchOneColumn(); my $r = FetchOneColumn();
if ($r eq "") { if (!defined $r || $r eq "") {
$r = "__UNKNOWN__"; $r = "__UNKNOWN__";
} }
$::cachedNameArray{$id} = $r; $::cachedNameArray{$id} = $r;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment