Skip to content

bugzilla
bugzilla
Commit 78b4d31f authored by gerv%gerv.net's avatar gerv%gerv.net
Browse files
Options

Bug 95426 - remove $onebug cruft. Patch by gerv; 2xr=timeless.

parent 64074d19
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 18 deletions
editkeywords.cgi
View file @ 78b4d31f
...@@ -141,22 +141,14 @@ if ($action eq "") { ...@@ -141,22 +141,14 @@ if ($action eq "") {
my $max_table_size = 50; my $max_table_size = 50;
SendSQL("SELECT keyworddefs.id, keyworddefs.name, keyworddefs.description, SendSQL("SELECT keyworddefs.id, keyworddefs.name, keyworddefs.description,
COUNT(keywords.bug_id), keywords.bug_id COUNT(keywords.bug_id)
FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id = keywords.keywordid FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id = keywords.keywordid
GROUP BY keyworddefs.id GROUP BY keyworddefs.id
ORDER BY keyworddefs.name"); ORDER BY keyworddefs.name");
while (MoreSQLData()) { while (MoreSQLData()) {
my ($id, $name, $description, $bugs, $onebug) = FetchSQLData(); my ($id, $name, $description, $bugs) = FetchSQLData();
$description ||= "<FONT COLOR=\"red\">missing</FONT>"; $description ||= "<FONT COLOR=\"red\">missing</FONT>";
$bugs ||= 'none'; $bugs ||= 'none';
if (!$onebug) {
# This is silly hackery for old versions of MySQL that seem to
# return a count() of 1 even if there are no matching. So, we
# ask for an actual bug number. If it can't find any bugs that
# match the keyword, then we set the count to be zero, ignoring
# what it had responded.
$bugs = 'none';
}
if ($line_count == $max_table_size) { if ($line_count == $max_table_size) {
print "</table>\n$tableheader"; print "</table>\n$tableheader";
$line_count = 0; $line_count = 0;
......
queryhelp.cgi
View file @ 78b4d31f
...@@ -575,19 +575,14 @@ my $line_count = 0; ...@@ -575,19 +575,14 @@ my $line_count = 0;
my $max_table_size = 50; my $max_table_size = 50;
SendSQL("SELECT keyworddefs.name, keyworddefs.description, SendSQL("SELECT keyworddefs.name, keyworddefs.description,
COUNT(keywords.bug_id), keywords.bug_id COUNT(keywords.bug_id)
FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id=keywords.keywordid FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id=keywords.keywordid
GROUP BY keyworddefs.id GROUP BY keyworddefs.id
ORDER BY keyworddefs.name"); ORDER BY keyworddefs.name");
while (MoreSQLData()) { while (MoreSQLData()) {
my ($name, $description, $bugs, $onebug) = FetchSQLData(); my ($name, $description, $bugs) = FetchSQLData();
if ($bugs && $onebug) { if ($bugs) {
# This 'onebug' stuff is silly hackery for old versions of
# MySQL that seem to return a count() of 1 even if there are
# no matching. So, we ask for an actual bug number. If it
# can't find any bugs that match the keyword, then we set the
# count to be zero, ignoring what it had responded.
my $q = url_quote($name); my $q = url_quote($name);
$bugs = qq{<A HREF="buglist.cgi?keywords=$q">$bugs</A>}; $bugs = qq{<A HREF="buglist.cgi?keywords=$q">$bugs</A>};
} else { } else {
......
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