Bug 225474: Fixing regression from bug 217422, xml.cgi got busted, and the patch...

r= bbaetz, a= justdave

diff --git a/Bug.pm b/Bug.pm
index 05d25a97fbc31d56db4ce7368ec240bc806a66b0..ee4f2164f5a38d9471c045a2c3761cca646f27c2 100755 (executable)
--- a/Bug.pm
+++ b/Bug.pm
@@ -112,7 +112,7 @@ sub initBug  {
       resolution, priority, bug_severity, component, assigned_to, reporter,
       bug_file_loc, short_desc, target_milestone, qa_contact,
       status_whiteboard, date_format(creation_ts,'%Y-%m-%d %H:%i'),
-      groupset, delta_ts, ifnull(sum(votes.vote_count),0),
+      groupset, delta_ts, ifnull(sum(votes.count),0)
     from bugs left join votes using(bug_id)
     where bugs.bug_id = $bug_id
     group by bugs.bug_id";

diff --git a/bug_form.pl b/bug_form.pl
index 14e9147bac98446b5f67d51c9641daf6cbef4a54..68f4c9f3d1e7a273c7e1f624c6869e83205c89ae 100644 (file)
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -83,7 +83,7 @@ sub show_bug {
         bug_file_loc, short_desc, target_milestone, 
         qa_contact, status_whiteboard, 
         date_format(creation_ts,'%Y-%m-%d %H:%i'),
-        groupset, delta_ts, sum(votes.count)
+        groupset, delta_ts, ifnull(sum(votes.count),0)
     FROM bugs LEFT JOIN votes USING(bug_id)
     WHERE bugs.bug_id = $id
     GROUP BY bugs.bug_id";