From d532205e6899e2fdbd0f892147a7e859b0e3bda1 Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Tue, 1 Jan 2013 23:59:13 +0100
Subject: [PATCH 001/240] Bug 816870: All extensions must require Perl 5.10.1
 to pass tests r/a=LpSolit

---
 extensions/BmpConvert/Config.pm                  | 2 ++
 extensions/BmpConvert/Extension.pm               | 2 ++
 extensions/Example/Config.pm                     | 2 ++
 extensions/Example/Extension.pm                  | 2 ++
 extensions/Example/lib/Auth/Login.pm             | 2 ++
 extensions/Example/lib/Auth/Verify.pm            | 2 ++
 extensions/Example/lib/Config.pm                 | 2 ++
 extensions/Example/lib/Util.pm                   | 2 ++
 extensions/Example/lib/WebService.pm             | 2 ++
 extensions/MoreBugUrl/Config.pm                  | 2 ++
 extensions/MoreBugUrl/Extension.pm               | 2 ++
 extensions/MoreBugUrl/lib/GetSatisfaction.pm     | 2 ++
 extensions/MoreBugUrl/lib/PHP.pm                 | 2 ++
 extensions/MoreBugUrl/lib/RT.pm                  | 2 ++
 extensions/MoreBugUrl/lib/ReviewBoard.pm         | 2 ++
 extensions/MoreBugUrl/lib/Rietveld.pm            | 2 ++
 extensions/OldBugMove/Config.pm                  | 2 ++
 extensions/OldBugMove/Extension.pm               | 2 ++
 extensions/OldBugMove/lib/Params.pm              | 1 +
 extensions/Voting/Config.pm                      | 2 ++
 extensions/Voting/Extension.pm                   | 2 ++
 template/en/default/extensions/config.pm.tmpl    | 2 ++
 template/en/default/extensions/extension.pm.tmpl | 2 ++
 template/en/default/extensions/util.pm.tmpl      | 2 ++
 24 files changed, 47 insertions(+)

diff --git a/extensions/BmpConvert/Config.pm b/extensions/BmpConvert/Config.pm
index 42fb3ceab..91808bc4b 100644
--- a/extensions/BmpConvert/Config.pm
+++ b/extensions/BmpConvert/Config.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BmpConvert;
+
+use 5.10.1;
 use strict;
 use constant NAME => 'BmpConvert';
 use constant REQUIRED_MODULES => [
diff --git a/extensions/BmpConvert/Extension.pm b/extensions/BmpConvert/Extension.pm
index b30bab604..eb634f4a1 100644
--- a/extensions/BmpConvert/Extension.pm
+++ b/extensions/BmpConvert/Extension.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::BmpConvert;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::Extension);
 
diff --git a/extensions/Example/Config.pm b/extensions/Example/Config.pm
index b40ed9906..13635dc7f 100644
--- a/extensions/Example/Config.pm
+++ b/extensions/Example/Config.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Example;
+
+use 5.10.1;
 use strict;
 use constant NAME => 'Example';
 use constant REQUIRED_MODULES => [
diff --git a/extensions/Example/Extension.pm b/extensions/Example/Extension.pm
index 7fc9072dc..c0015803e 100644
--- a/extensions/Example/Extension.pm
+++ b/extensions/Example/Extension.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Example;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::Extension);
 
diff --git a/extensions/Example/lib/Auth/Login.pm b/extensions/Example/lib/Auth/Login.pm
index 03ca2481d..c1cfe62cc 100644
--- a/extensions/Example/lib/Auth/Login.pm
+++ b/extensions/Example/lib/Auth/Login.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Example::Auth::Login;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::Auth::Login);
 use constant user_can_create_account => 0;
diff --git a/extensions/Example/lib/Auth/Verify.pm b/extensions/Example/lib/Auth/Verify.pm
index 0a0b40232..df5059a05 100644
--- a/extensions/Example/lib/Auth/Verify.pm
+++ b/extensions/Example/lib/Auth/Verify.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Example::Auth::Verify;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::Auth::Verify);
 use Bugzilla::Constants;
diff --git a/extensions/Example/lib/Config.pm b/extensions/Example/lib/Config.pm
index b0497a783..fac0046af 100644
--- a/extensions/Example/lib/Config.pm
+++ b/extensions/Example/lib/Config.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Example::Config;
+
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Example/lib/Util.pm b/extensions/Example/lib/Util.pm
index b4ed3e0a4..ccc349c9c 100644
--- a/extensions/Example/lib/Util.pm
+++ b/extensions/Example/lib/Util.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Example::Util;
+
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/Example/lib/WebService.pm b/extensions/Example/lib/WebService.pm
index e5e14af53..c8c120616 100644
--- a/extensions/Example/lib/WebService.pm
+++ b/extensions/Example/lib/WebService.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Example::WebService;
+
+use 5.10.1;
 use strict;
 use warnings;
 use parent qw(Bugzilla::WebService);
diff --git a/extensions/MoreBugUrl/Config.pm b/extensions/MoreBugUrl/Config.pm
index b5af9c00e..1e62306c4 100644
--- a/extensions/MoreBugUrl/Config.pm
+++ b/extensions/MoreBugUrl/Config.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::MoreBugUrl;
+
+use 5.10.1;
 use strict;
 
 use constant NAME => 'MoreBugUrl';
diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm
index b251e70a8..5c71fa598 100644
--- a/extensions/MoreBugUrl/Extension.pm
+++ b/extensions/MoreBugUrl/Extension.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::MoreBugUrl;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::Extension);
 
diff --git a/extensions/MoreBugUrl/lib/GetSatisfaction.pm b/extensions/MoreBugUrl/lib/GetSatisfaction.pm
index 5adb897bc..4c077b1a6 100644
--- a/extensions/MoreBugUrl/lib/GetSatisfaction.pm
+++ b/extensions/MoreBugUrl/lib/GetSatisfaction.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::MoreBugUrl::GetSatisfaction;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::BugUrl);
 
diff --git a/extensions/MoreBugUrl/lib/PHP.pm b/extensions/MoreBugUrl/lib/PHP.pm
index 38795b5e6..1521cae1a 100644
--- a/extensions/MoreBugUrl/lib/PHP.pm
+++ b/extensions/MoreBugUrl/lib/PHP.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::MoreBugUrl::PHP;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::BugUrl);
 
diff --git a/extensions/MoreBugUrl/lib/RT.pm b/extensions/MoreBugUrl/lib/RT.pm
index 132118089..724456828 100644
--- a/extensions/MoreBugUrl/lib/RT.pm
+++ b/extensions/MoreBugUrl/lib/RT.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::MoreBugUrl::RT;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::BugUrl);
 
diff --git a/extensions/MoreBugUrl/lib/ReviewBoard.pm b/extensions/MoreBugUrl/lib/ReviewBoard.pm
index 0c4d83fab..08128353f 100644
--- a/extensions/MoreBugUrl/lib/ReviewBoard.pm
+++ b/extensions/MoreBugUrl/lib/ReviewBoard.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::MoreBugUrl::ReviewBoard;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::BugUrl);
 
diff --git a/extensions/MoreBugUrl/lib/Rietveld.pm b/extensions/MoreBugUrl/lib/Rietveld.pm
index f9e894032..a8bccba08 100644
--- a/extensions/MoreBugUrl/lib/Rietveld.pm
+++ b/extensions/MoreBugUrl/lib/Rietveld.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::MoreBugUrl::Rietveld;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::BugUrl);
 
diff --git a/extensions/OldBugMove/Config.pm b/extensions/OldBugMove/Config.pm
index 95648610e..a42567fee 100644
--- a/extensions/OldBugMove/Config.pm
+++ b/extensions/OldBugMove/Config.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::OldBugMove;
+
+use 5.10.1;
 use strict;
 use constant NAME => 'OldBugMove';
 __PACKAGE__->NAME;
diff --git a/extensions/OldBugMove/Extension.pm b/extensions/OldBugMove/Extension.pm
index 913553790..b58ffe883 100644
--- a/extensions/OldBugMove/Extension.pm
+++ b/extensions/OldBugMove/Extension.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::OldBugMove;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::Extension);
 use Bugzilla::Constants;
diff --git a/extensions/OldBugMove/lib/Params.pm b/extensions/OldBugMove/lib/Params.pm
index dbb1eb21d..c922e1faf 100644
--- a/extensions/OldBugMove/lib/Params.pm
+++ b/extensions/OldBugMove/lib/Params.pm
@@ -7,6 +7,7 @@
 
 package Bugzilla::Extension::OldBugMove::Params;
 
+use 5.10.1;
 use strict;
 
 use Bugzilla::Config::Common;
diff --git a/extensions/Voting/Config.pm b/extensions/Voting/Config.pm
index 4fefe957a..812ede60f 100644
--- a/extensions/Voting/Config.pm
+++ b/extensions/Voting/Config.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Voting;
+
+use 5.10.1;
 use strict;
 
 use constant NAME => 'Voting';
diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm
index 981751a34..387d44ee0 100644
--- a/extensions/Voting/Extension.pm
+++ b/extensions/Voting/Extension.pm
@@ -6,6 +6,8 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::Voting;
+
+use 5.10.1;
 use strict;
 use parent qw(Bugzilla::Extension);
 
diff --git a/template/en/default/extensions/config.pm.tmpl b/template/en/default/extensions/config.pm.tmpl
index cb7195767..07ac83a41 100644
--- a/template/en/default/extensions/config.pm.tmpl
+++ b/template/en/default/extensions/config.pm.tmpl
@@ -13,6 +13,8 @@
 [% PROCESS extensions/license.txt.tmpl %]
 
 package B[% %]ugzilla::Extension::[% name %];
+
+use 5.10.1;
 use strict;
 
 use constant NAME => '[% name %]';
diff --git a/template/en/default/extensions/extension.pm.tmpl b/template/en/default/extensions/extension.pm.tmpl
index 993bceb18..ebeb73719 100644
--- a/template/en/default/extensions/extension.pm.tmpl
+++ b/template/en/default/extensions/extension.pm.tmpl
@@ -13,6 +13,8 @@
 [% PROCESS extensions/license.txt.tmpl %]
 
 package B[% %]ugzilla::Extension::[% name %];
+
+use 5.10.1;
 use strict;
 use parent qw(B[% %]ugzilla::Extension);
 
diff --git a/template/en/default/extensions/util.pm.tmpl b/template/en/default/extensions/util.pm.tmpl
index c693c8a01..3493007f4 100644
--- a/template/en/default/extensions/util.pm.tmpl
+++ b/template/en/default/extensions/util.pm.tmpl
@@ -13,6 +13,8 @@
 [% PROCESS extensions/license.txt.tmpl %]
 
 package B[% %]ugzilla::Extension::[% name %]::Util;
+
+use 5.10.1;
 use strict;
 use parent qw(Exporter);
 our @EXPORT = qw(

From df37671cc2878484c5868300af60e46f732aa0ab Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 2 Jan 2013 00:22:58 +0100
Subject: [PATCH 002/240] Bug 401918: describekeywords.cgi with no keywords
 simply displays an empty page instead of throwing an error r/a=LpSolit

---
 describekeywords.cgi                            | 3 +++
 template/en/default/global/user-error.html.tmpl | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/describekeywords.cgi b/describekeywords.cgi
index ef0634960..4976fada1 100755
--- a/describekeywords.cgi
+++ b/describekeywords.cgi
@@ -24,6 +24,9 @@ my $vars = {};
 Bugzilla->switch_to_shadow_db;
 
 $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
+if (!@{$vars->{keywords}}) {
+    ThrowUserError("no_keywords");
+}
 $vars->{'caneditkeywords'} = $user->in_group("editkeywords");
 
 print $cgi->header();
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index ce80a5eef..03c26c5aa 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1282,6 +1282,11 @@
     [% title = "No Initial $terms.Bug Status" %]
     No [% terms.bug %] status is available on [% terms.bug %] creation.
     Please report the problem to [% Param("maintainer") %].
+    
+  [% ELSIF error == "no_keywords" %]
+    [% title = "No Keywords" %]
+    [% admindocslinks = {'keywords.html' => 'Setting up a keyword'} %]
+    No keywords have been defined for this installation.
 
   [% ELSIF error == "no_new_quips" %]
     [% title = "No New Quips" %]

From 62f2be6159ae5d990c41714bb3dfd35ec0336d12 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Wed, 2 Jan 2013 00:25:33 +0100
Subject: [PATCH 003/240] Bug 415658: Allow apostrophes in email addresses
 r/a=LpSolit

---
 Bugzilla/Config/Auth.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/Config/Auth.pm b/Bugzilla/Config/Auth.pm
index 289536bbd..699881122 100644
--- a/Bugzilla/Config/Auth.pm
+++ b/Bugzilla/Config/Auth.pm
@@ -82,7 +82,7 @@ sub get_param_list {
   {
    name => 'emailregexp',
    type => 't',
-   default => q:^[\\w\\.\\+\\-=]+@[\\w\\.\\-]+\\.[\\w\\-]+$:,
+   default => q:^[\\w\\.\\+\\-=']+@[\\w\\.\\-]+\\.[\\w\\-]+$:,
    checker => \&check_regexp
   },
 

From 99c572c88d359ee907b822089bcca9446e89c046 Mon Sep 17 00:00:00 2001
From: Koosha Khajeh Moogahi <koosha.khajeh@gmail.com>
Date: Wed, 2 Jan 2013 00:40:17 +0100
Subject: [PATCH 004/240] Bug 353351: The name of the component in
 enter_bug.cgi should not be case sensitive r=glob a=LpSolit

---
 template/en/default/bug/create/create.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 62b2d6a60..132385ef5 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -212,7 +212,7 @@ TUI_hide_default('attachment_text_field');
           [% NEXT IF NOT c.is_active %]
           <option value="[% c.name FILTER html %]"
                   id="v[% c.id FILTER html %]_component"
-            [% IF c.name == default.component_ %]
+            [% IF c.name.lower == default.component_.lower %]
               [%# This is for bug/field.html.tmpl, for visibility-related
                 # controls. %]
               [% default.component_id = c.id %]

From 9a147781ec6bbb381713933da88c29114eced085 Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Wed, 2 Jan 2013 01:02:48 +0100
Subject: [PATCH 005/240] Bug 825784: hook/global/messages-messages.html.tmpl
 has DOS line-endings r/a=LpSolit

---
 .../hook/global/messages-messages.html.tmpl   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/extensions/Voting/template/en/default/hook/global/messages-messages.html.tmpl b/extensions/Voting/template/en/default/hook/global/messages-messages.html.tmpl
index 74a2d937a..e6e5f22c7 100644
--- a/extensions/Voting/template/en/default/hook/global/messages-messages.html.tmpl
+++ b/extensions/Voting/template/en/default/hook/global/messages-messages.html.tmpl
@@ -1,16 +1,16 @@
-[%# This Source Code Form is subject to th  e terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-[%# This is a list of all the possible messages. Please keep them in
-  # alphabetical order by message tag, and leave a blank line between messages.
-  #%]
-  
-[% IF message_tag == "votes_recorded" %]
-    The changes to your votes have been saved.
-[% END %]
-
+[%# This Source Code Form is subject to th  e terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# This is a list of all the possible messages. Please keep them in
+  # alphabetical order by message tag, and leave a blank line between messages.
+  #%]
+  
+[% IF message_tag == "votes_recorded" %]
+    The changes to your votes have been saved.
+[% END %]
+

From 993d56c345ab706fc5002dd8fa87ecd0076601a4 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 2 Jan 2013 01:21:32 +0100
Subject: [PATCH 006/240] Bug 685607: When a user edits the last bug of a
 buglist and his user pref is set to "Show next bug in my list", the page
 header looks like to have missing data r/a=LpSolit

---
 template/en/default/bug/show-header.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index bb20b721b..54d51dd4f 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -21,11 +21,11 @@
   [% title = title _ "($bug.alias) " %]
 [% END %]
 [% title = title _ filtered_desc %]
-[% header = "$terms.Bug&nbsp;$bug.bug_id" %]
-[% header_addl_info = "Last modified: $filtered_timestamp" %]
 [% yui = ['autocomplete', 'calendar'] %]
 [% javascript_urls = [ "js/util.js", "js/field.js" ] %]
 [% IF bug.defined %]
+  [% header = "$terms.Bug&nbsp;$bug.bug_id" %]
+  [% header_addl_info = "Last modified: $filtered_timestamp" %]
   [% unfiltered_title = "$terms.Bug $bug.bug_id – " %]
   [% IF bug.alias != '' %]
     [% unfiltered_title = unfiltered_title _ "($bug.alias) " %]

From 6646707288014bd5586a1ca22437d984163db2b1 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 2 Jan 2013 01:40:19 +0100
Subject: [PATCH 007/240] Bug 825524: When cloning a bug, the "We've made a
 guess at your operating system and platform" message should not be displayed
 r/a=LpSolit

---
 template/en/default/bug/create/create.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 132385ef5..382e704b7 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -284,7 +284,7 @@ TUI_hide_default('attachment_text_field');
        bug = default, field = bug_fields.op_sys, editable = 1, 
        value = default.op_sys %]
   </tr>
-  [% IF !Param('defaultplatform') || !Param('defaultopsys') %]
+  [% IF (!Param('defaultplatform') || !Param('defaultopsys')) && !cloned_bug_id %]
     <tr>
       <th colspan="3">&nbsp;</th>
       <td id="os_guess_note" class="comment">

From b47a2281f44f44281d52c8a6b7a78ef725ffac75 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 2 Jan 2013 01:46:21 +0100
Subject: [PATCH 008/240] Bug 824342: The "First" and "Last" links should be
 disabled on bug navigation when we are on the first or last bug respectively
 of the buglist r=LpSolit a=justdave

---
 template/en/default/bug/navigate.html.tmpl | 23 +++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index 22d8c4799..843c970c1 100644
--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -32,14 +32,23 @@
   <b>[% terms.Bug %] List:</b>
 
   ([% this_bug_idx + 1 %] of [% last_bug_list.size %])
+  
+  [% IF this_bug_idx > 0 %]
+    <a href="show_bug.cgi?id=
+             [%- last_bug_list.first FILTER uri %]&amp;list_id=
+             [%- my_search.id FILTER uri %]">First</a>
+  [% ELSE %]
+    <i><font color="#777777">First</font></i>
+  [% END %]
 
-  <a href="show_bug.cgi?id=
-           [%- last_bug_list.first FILTER uri %]&amp;list_id=
-           [%- my_search.id FILTER uri %]">First</a>
-  <a href="show_bug.cgi?id=
-           [%- last_bug_list.last FILTER uri %]&amp;list_id=
-           [%- my_search.id FILTER uri %]">Last</a>
-
+  [% IF this_bug_idx + 1 < last_bug_list.size %]
+    <a href="show_bug.cgi?id=
+             [%- last_bug_list.last FILTER uri %]&amp;list_id=
+             [%- my_search.id FILTER uri %]">Last</a>
+  [% ELSE %]
+    <i><font color="#777777">Last</font></i>
+  [% END %]
+  
   [% IF this_bug_idx > 0 %]
     [% prev_bug = this_bug_idx - 1 %]
     <a href="show_bug.cgi?id=

From e9bcc96d558501ea36202915666f35c1536aec04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 2 Jan 2013 13:13:16 +0100
Subject: [PATCH 009/240] Bug 825431: List::MoreUtils older than 0.27_04 leaks
 memory when using part() r=glob a=LpSolit

---
 Bugzilla/Install/Requirements.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index efe444913..9bc5be14a 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -147,10 +147,11 @@ sub REQUIRED_MODULES {
         # in a URL query string.
         version => '1.37',
     },
+    # 0.32 fixes several memory leaks in the XS version of some functions.
     {
         package => 'List-MoreUtils',
         module  => 'List::MoreUtils',
-        version => 0.22,
+        version => 0.32,
     },
     {
         package => 'Math-Random-ISAAC',

From 81085f1bfd1763d1dacf793237a7f572fe14b152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 2 Jan 2013 13:16:49 +0100
Subject: [PATCH 010/240] Bug 825781: extensions/create.pl should capitalize
 the name of the new extension automatically instead of complaining r=glob
 a=LpSolit

---
 extensions/create.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/create.pl b/extensions/create.pl
index c48f60df8..e5a436845 100755
--- a/extensions/create.pl
+++ b/extensions/create.pl
@@ -20,6 +20,7 @@ use File::Path qw(mkpath);
 my $base_dir = bz_locations()->{'extensionsdir'};
 
 my $name = $ARGV[0] or ThrowUserError('extension_create_no_name');
+$name = ucfirst($name);
 if ($name !~ /^[A-Z]/) {
     ThrowUserError('extension_first_letter_caps', { name => $name });
 }

From cb5d2821bf2504c463824b7f9fe53fca4213e9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 2 Jan 2013 16:01:40 +0100
Subject: [PATCH 011/240] Bug 824640: The product name generated by
 collectstats.pl is broken r=wurblzap a=LpSolit

---
 collectstats.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/collectstats.pl b/collectstats.pl
index e1a4603f3..bf0c68696 100755
--- a/collectstats.pl
+++ b/collectstats.pl
@@ -204,13 +204,14 @@ sub collect_stats {
 
     if (!$exists || scalar(@data)) {
         my $fields = join('|', ('DATE', @statuses, @resolutions));
+        my $product_name = $product->name;
         print DATA <<FIN;
 # Bugzilla Daily Bug Stats
 #
 # Do not edit me! This file is generated.
 #
 # fields: $fields
-# Product: $product->name
+# Product: $product_name
 # Created: $when
 FIN
     }
@@ -308,13 +309,14 @@ sub regenerate_stats {
 
     if (open DATA, ">$file") {
         my $fields = join('|', ('DATE', @statuses, @resolutions));
+        my $product_name = $product->name;
         print DATA <<FIN;
 # Bugzilla Daily Bug Stats
 #
 # Do not edit me! This file is generated.
 #
 # fields: $fields
-# Product: $product->name
+# Product: $product_name
 # Created: $when
 FIN
         # For each day, generate a line of statistics.
@@ -323,7 +325,7 @@ FIN
         for (my $day = $start + 1; $day <= $end; $day++) {
             # Some output feedback
             my $percent_done = ($day - $start - 1) * 100 / $total_days;
-            printf "\rRegenerating %s \[\%.1f\%\%]", $product->name,
+            printf "\rRegenerating %s \[\%.1f\%\%]", $product_name,
                                                      $percent_done;
 
             # Get a list of bugs that were created the previous day, and
@@ -372,7 +374,7 @@ FIN
 
         # Finish up output feedback for this product.
         my $tend = time;
-        say "\rRegenerating " . $product->name . ' [100.0%] - ' .
+        say "\rRegenerating " . $product_name . ' [100.0%] - ' .
             delta_time($tstart, $tend);
 
         close DATA;

From a0e4cbbd27677cc9c10f2e9fd84222e7392d4edb Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 3 Jan 2013 00:31:37 +0800
Subject: [PATCH 012/240] Bug 822547: Make jobqueue.pl clear the request cache
 before sending each mail r=dkl,a=LpSolit

---
 Bugzilla.pm          | 14 +++++++++++++-
 Bugzilla/JobQueue.pm |  7 +++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 111d567e6..baaf78ff7 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -618,6 +618,18 @@ sub request_cache {
     return $_request_cache;
 }
 
+sub clear_request_cache {
+    $_request_cache = {};
+    if ($ENV{MOD_PERL}) {
+        require Apache2::RequestUtil;
+        my $request = eval { Apache2::RequestUtil->request };
+        if ($request) {
+            my $pnotes = $request->pnotes;
+            delete @$pnotes{(keys %$pnotes)};
+        }
+    }
+}
+
 # This is a per-process cache.  Under mod_cgi it's identical to the
 # request_cache.  When using mod_perl, items in this cache live until the
 # worker process is terminated.
@@ -639,7 +651,7 @@ sub _cleanup {
         $dbh->bz_rollback_transaction() if $dbh->bz_in_transaction;
         $dbh->disconnect;
     }
-    undef $_request_cache;
+    clear_request_cache();
 
     # These are both set by CGI.pm but need to be undone so that
     # Apache can actually shut down its children if it needs to.
diff --git a/Bugzilla/JobQueue.pm b/Bugzilla/JobQueue.pm
index 519313448..098ee7935 100644
--- a/Bugzilla/JobQueue.pm
+++ b/Bugzilla/JobQueue.pm
@@ -93,6 +93,13 @@ sub insert {
     return $retval;
 }
 
+# Clear the request cache at the start of each run.
+sub work_once {
+    my $self = shift;
+    Bugzilla->clear_request_cache();
+    return $self->SUPER::work_once(@_);
+}
+
 1;
 
 __END__

From 31bbd332f504c0aae324be2a6e73069bf4779e98 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 3 Jan 2013 00:51:58 +0800
Subject: [PATCH 013/240] Bug 822547: Fix POD coverage bustage

---
 Bugzilla.pm | 4 ++++
 t/011pod.t  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index baaf78ff7..e06b67ead 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -943,6 +943,10 @@ this Bugzilla installation.
 Tells you whether or not a specific feature is enabled. For names
 of features, see C<OPTIONAL_MODULES> in C<Bugzilla::Install::Requirements>.
 
+=item C<clear_request_cache>
+
+Removes all entries from the C<request_cache>.
+
 =back
 
 =head1 B<Methods in need of POD>
diff --git a/t/011pod.t b/t/011pod.t
index 7b9d0ee13..7fdafd910 100644
--- a/t/011pod.t
+++ b/t/011pod.t
@@ -30,6 +30,7 @@ use constant DEFAULT_WHITELIST => qr/^(?:new|new_from_list|check|run_create_vali
 use constant SUB_WHITELIST => (
     'Bugzilla::Flag'     => qr/^(?:(force_)?retarget|force_cleanup)$/,
     'Bugzilla::FlagType' => qr/^sqlify_criteria$/,
+    'Bugzilla::JobQueue' => qr/^work_once$/,
 );
 
 # These modules do not need to be documented, generally because they

From 1bed425f078e646c130716f1d1c8d4cb646fec4a Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 3 Jan 2013 01:03:31 +0800
Subject: [PATCH 014/240] Bug 817486: fix _sync_fulltext to avoid always
 updating bugs_fulltext.short_desc r=LpSolit,a=LpSolit

---
 Bugzilla/Bug.pm     | 59 ++++++++++++++++++++++++++++++---------------
 Bugzilla/Comment.pm |  2 +-
 Bugzilla/Migrate.pm |  2 +-
 importxml.pl        |  2 +-
 sanitycheck.cgi     |  2 +-
 5 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index d912cd4ea..c58fec460 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -731,7 +731,7 @@ sub create {
     # Because MySQL doesn't support transactions on the fulltext table,
     # we do this after we've committed the transaction. That way we're
     # sure we're inserting a good Bug ID.
-    $bug->_sync_fulltext('new bug');
+    $bug->_sync_fulltext( new_bug => 1 );
 
     return $bug;
 }
@@ -1026,9 +1026,10 @@ sub update {
     # in the middle of a transaction, and if that transaction is rolled
     # back, this change will *not* be rolled back. As we expect rollbacks
     # to be extremely rare, that is OK for us.
-    $self->_sync_fulltext()
-        if $self->{added_comments} || $changes->{short_desc}
-           || $self->{comment_isprivate};
+    $self->_sync_fulltext(
+        update_short_desc => $changes->{short_desc},
+        update_comments   => $self->{added_comments} || $self->{comment_isprivate}
+    );
 
     # Remove obsolete internal variables.
     delete $self->{'_old_assigned_to'};
@@ -1062,25 +1063,43 @@ sub _extract_multi_selects {
 
 # Should be called any time you update short_desc or change a comment.
 sub _sync_fulltext {
-    my ($self, $new_bug) = @_;
+    my ($self, %options) = @_;
     my $dbh = Bugzilla->dbh;
-    if ($new_bug) {
-        $dbh->do('INSERT INTO bugs_fulltext (bug_id, short_desc)
-                  SELECT bug_id, short_desc FROM bugs WHERE bug_id = ?',
-                 undef, $self->id);
+
+    my($all_comments, $public_comments);
+    if ($options{new_bug} || $options{update_comments}) {
+        my $comments = $dbh->selectall_arrayref(
+            'SELECT thetext, isprivate FROM longdescs WHERE bug_id = ?',
+            undef, $self->id);
+        $all_comments = join("\n", map { $_->[0] } @$comments);
+        my @no_private = grep { !$_->[1] } @$comments;
+        $public_comments = join("\n", map { $_->[0] } @no_private);
     }
-    else {
-        $dbh->do('UPDATE bugs_fulltext SET short_desc = ? WHERE bug_id = ?',
-                 undef, $self->short_desc, $self->id);
+
+    if ($options{new_bug}) {
+        $dbh->do('INSERT INTO bugs_fulltext (bug_id, short_desc, comments,
+                                             comments_noprivate)
+                 VALUES (?, ?, ?, ?)',
+                 undef,
+                 $self->id, $self->short_desc, $all_comments, $public_comments);
+    } else {
+        my(@names, @values);
+        if ($options{update_short_desc}) {
+            push @names, 'short_desc';
+            push @values, $self->short_desc;
+        }
+        if ($options{update_comments}) {
+            push @names, ('comments', 'comments_noprivate');
+            push @values, ($all_comments, $public_comments);
+        }
+        if (@names) {
+            $dbh->do('UPDATE bugs_fulltext SET ' .
+                     join(', ', map { "$_ = ?" } @names) .
+                     ' WHERE bug_id = ?',
+                     undef,
+                     @values, $self->id);
+        }
     }
-    my $comments = $dbh->selectall_arrayref(
-        'SELECT thetext, isprivate FROM longdescs WHERE bug_id = ?',
-        undef, $self->id);
-    my $all = join("\n", map { $_->[0] } @$comments);
-    my @no_private = grep { !$_->[1] } @$comments;
-    my $nopriv_string = join("\n", map { $_->[0] } @no_private);
-    $dbh->do('UPDATE bugs_fulltext SET comments = ?, comments_noprivate = ?
-               WHERE bug_id = ?', undef, $all, $nopriv_string, $self->id);
 }
 
 sub remove_from_db {
diff --git a/Bugzilla/Comment.pm b/Bugzilla/Comment.pm
index 0277819c4..d4e3383ea 100644
--- a/Bugzilla/Comment.pm
+++ b/Bugzilla/Comment.pm
@@ -80,7 +80,7 @@ use constant VALIDATOR_DEPENDENCIES => {
 sub update {
     my $self = shift;
     my $changes = $self->SUPER::update(@_);
-    $self->bug->_sync_fulltext();
+    $self->bug->_sync_fulltext( update_comments => 1);
     return $changes;
 }
 
diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm
index a23cbd32a..6671ac375 100644
--- a/Bugzilla/Migrate.pm
+++ b/Bugzilla/Migrate.pm
@@ -815,7 +815,7 @@ sub _insert_comments {
         $self->_do_table_insert('longdescs', \%copy);
         $self->debug("  Inserted comment from " . $who->login, 2);
     }
-    $bug->_sync_fulltext();
+    $bug->_sync_fulltext( update_comments => 1 );
 }
 
 sub _insert_history {
diff --git a/importxml.pl b/importxml.pl
index 3b0bc093b..92a85c6da 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -1192,7 +1192,7 @@ sub process_bug {
                               $c->{isprivate}, $c->{thetext}, 0);
     }
     $sth_comment->execute($id, $exporterid, $timestamp, 0, $comments, $worktime);
-    Bugzilla::Bug->new($id)->_sync_fulltext('new_bug');
+    Bugzilla::Bug->new($id)->_sync_fulltext( new_bug => 1);
 
     # Add this bug to each group of which its product is a member.
     my $sth_group = $dbh->prepare("INSERT INTO bug_group_map (bug_id, group_id) 
diff --git a/sanitycheck.cgi b/sanitycheck.cgi
index ad5925d06..256438bd8 100755
--- a/sanitycheck.cgi
+++ b/sanitycheck.cgi
@@ -207,7 +207,7 @@ if ($cgi->param('repair_bugs_fulltext')) {
                                             WHERE bugs_fulltext.bug_id IS NULL');
 
    foreach my $bugid (@$bug_ids) {
-       Bugzilla::Bug->new($bugid)->_sync_fulltext('new_bug');
+       Bugzilla::Bug->new($bugid)->_sync_fulltext( new_bug => 1 );
    }
 
    Status('bugs_fulltext_fixed', {bug_count => scalar(@$bug_ids)});

From 78b4b3223fcd6d0f986ffe08b91ca6c21c91e0ef Mon Sep 17 00:00:00 2001
From: Gervase Markham <gerv@gerv.net>
Date: Wed, 2 Jan 2013 17:09:36 +0000
Subject: [PATCH 015/240] Bug 413851 - add CSV output option to request lists.
 r=LpSolit.

---
 Bugzilla/CGI.pm                             | 25 +++++++++++
 buglist.cgi                                 | 31 +++++---------
 report.cgi                                  |  7 +---
 request.cgi                                 | 15 +++++--
 template/en/default/request/queue.csv.tmpl  | 46 +++++++++++++++++++++
 template/en/default/request/queue.html.tmpl |  6 ++-
 6 files changed, 99 insertions(+), 31 deletions(-)
 create mode 100644 template/en/default/request/queue.csv.tmpl

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index cb92800f1..513babd4f 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -281,6 +281,10 @@ sub header {
         unshift(@_, '-type' => shift(@_));
     }
 
+    if ($self->{'_content_disp'}) {
+        unshift(@_, '-content_disposition' => $self->{'_content_disp'});
+    }
+
     # Add the cookies in if we have any
     if (scalar(@{$self->{Bugzilla_cookie_list}})) {
         unshift(@_, '-cookie' => $self->{Bugzilla_cookie_list});
@@ -528,6 +532,22 @@ sub url_is_attachment_base {
     return ($self->self_url =~ $regex) ? 1 : 0;
 }
 
+sub set_dated_content_disp {
+    my ($self, $type, $prefix, $ext) = @_;
+
+    my @time = localtime(time());
+    my $date = sprintf "%04d-%02d-%02d", 1900+$time[5], $time[4]+1, $time[3];
+    my $filename = "$prefix-$date.$ext";
+
+    $filename =~ s/\s/_/g; # Remove whitespace to avoid HTTP header tampering
+    $filename =~ s/\\/_/g; # Remove backslashes as well
+    $filename =~ s/"/\\"/g; # escape quotes
+
+    my $disposition = "$type; filename=\"$filename\"";
+
+    $self->{'_content_disp'} = $disposition;
+}
+
 ##########################
 # Vars TIEHASH Interface #
 ##########################
@@ -635,6 +655,11 @@ instead of calling this directly.
 
 Redirects from the current URL to one prefixed by the urlbase parameter.
 
+=item C<set_dated_content_disp>
+
+Sets an appropriate date-dependent value for the Content Disposition header
+for a downloadable resource.
+
 =back
 
 =head1 SEE ALSO
diff --git a/buglist.cgi b/buglist.cgi
index a59f0ee18..8a436a0a2 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -281,18 +281,17 @@ sub GetGroups {
 }
 
 sub _close_standby_message {
-    my ($contenttype, $disposition, $serverpush) = @_;
+    my ($contenttype, $disp, $disp_prefix, $extension, $serverpush) = @_;
     my $cgi = Bugzilla->cgi;
-
+    $cgi->set_dated_content_disp($disp, $disp_prefix, $extension);
+    
     # Close the "please wait" page, then open the buglist page
     if ($serverpush) {
         print $cgi->multipart_end();
-        print $cgi->multipart_start(-type                => $contenttype,
-                                    -content_disposition => $disposition);
+        print $cgi->multipart_start(-type => $contenttype);
     }
     else {
-        print $cgi->header(-type                => $contenttype,
-                           -content_disposition => $disposition);
+        print $cgi->header($contenttype);
     }
 }
 
@@ -324,17 +323,10 @@ $params ||= new Bugzilla::CGI($cgi);
 # if available.  We have to do this now, even though we return HTTP headers 
 # at the end, because the fact that there is a remembered query gets 
 # forgotten in the process of retrieving it.
-my @time = localtime(time());
-my $date = sprintf "%04d-%02d-%02d", 1900+$time[5],$time[4]+1,$time[3];
-my $filename = "bugs-$date.$format->{extension}";
+my $disp_prefix = "bugs";
 if ($cmdtype eq "dorem" && $remaction =~ /^run/) {
-    $filename = $cgi->param('namedcmd') . "-$date.$format->{extension}";
-    # Remove white-space from the filename so the user cannot tamper
-    # with the HTTP headers.
-    $filename =~ s/\s/_/g;
+    $disp_prefix = $cgi->param('namedcmd');
 }
-$filename =~ s/\\/\\\\/g; # escape backslashes
-$filename =~ s/"/\\"/g; # escape quotes
 
 # Take appropriate action based on user's request.
 if ($cmdtype eq "dorem") {  
@@ -935,7 +927,8 @@ if ($one_product && $user->can_enter_product($one_product)) {
 # The following variables are used when the user is making changes to multiple bugs.
 if ($dotweak && scalar @bugs) {
     if (!$vars->{'caneditbugs'}) {
-        _close_standby_message('text/html', 'inline', $serverpush);
+        _close_standby_message('text/html', 
+                               'inline', "error", "html", $serverpush);
         ThrowUserError('auth_failure', {group  => 'editbugs',
                                         action => 'modify',
                                         object => 'multiple_bugs'});
@@ -1042,10 +1035,8 @@ if ($format->{'extension'} eq "csv") {
     $vars->{'human'} = $cgi->param('human');
 }
 
-# Suggest a name for the bug list if the user wants to save it as a file.
-$disposition .= "; filename=\"$filename\"";
-
-_close_standby_message($contenttype, $disposition, $serverpush);
+_close_standby_message($contenttype, $disposition, $disp_prefix, 
+                       $format->{'extension'}, $serverpush);
 
 ################################################################################
 # Content Generation
diff --git a/report.cgi b/report.cgi
index e70dcf4b2..69aadddbd 100755
--- a/report.cgi
+++ b/report.cgi
@@ -309,11 +309,8 @@ my $format = $template->get_format("reports/report", $formatparam,
 # set debug=1 to always get an HTML content-type, and view the error.
 $format->{'ctype'} = "text/html" if $cgi->param('debug');
 
-my @time = localtime(time());
-my $date = sprintf "%04d-%02d-%02d", 1900+$time[5],$time[4]+1,$time[3];
-my $filename = "report-$date.$format->{extension}";
-print $cgi->header(-type => $format->{'ctype'},
-                   -content_disposition => "inline; filename=$filename");
+$cgi->set_dated_content_disp("inline", "report", $format->{extension});
+print $cgi->header($format->{'ctype'});
 
 # Problems with this CGI are often due to malformed data. Setting debug=1
 # prints out both data structures.
diff --git a/request.cgi b/request.cgi
index 17e6c926d..436f94bc4 100755
--- a/request.cgi
+++ b/request.cgi
@@ -26,8 +26,12 @@ my $cgi = Bugzilla->cgi;
 Bugzilla->switch_to_shadow_db;
 my $template = Bugzilla->template;
 my $action = $cgi->param('action') || '';
+my $format = $template->get_format('request/queue', 
+                                   scalar($cgi->param('format')),
+                                   scalar($cgi->param('ctype')));
 
-print $cgi->header();
+$cgi->set_dated_content_disp("inline", "requests", $format->{extension});
+print $cgi->header($format->{'ctype'});
 
 my $fields;
 $fields->{'requester'}->{'type'} = 'single';
@@ -42,7 +46,7 @@ unless (defined $cgi->param('requestee')
 Bugzilla::User::match_field($fields);
 
 if ($action eq 'queue') {
-    queue();
+    queue($format);
 }
 else {
     my $flagtypes = get_flag_types();
@@ -60,7 +64,7 @@ else {
     }
     $vars->{'components'} = [ sort { $a cmp $b } keys %components ];
 
-    $template->process('request/queue.html.tmpl', $vars)
+    $template->process($format->{'template'}, $vars)
       || ThrowTemplateError($template->error());
 }
 exit;
@@ -70,6 +74,7 @@ exit;
 ################################################################################
 
 sub queue {
+    my $format = shift;
     my $cgi = Bugzilla->cgi;
     my $dbh = Bugzilla->dbh;
     my $template = Bugzilla->template;
@@ -295,8 +300,10 @@ sub queue {
     }
     $vars->{'components'} = [ sort { $a cmp $b } keys %components ];
 
+    $vars->{'urlquerypart'} = $cgi->canonicalise_query('ctype');
+
     # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("request/queue.html.tmpl", $vars)
+    $template->process($format->{'template'}, $vars)
       || ThrowTemplateError($template->error());
 }
 
diff --git a/template/en/default/request/queue.csv.tmpl b/template/en/default/request/queue.csv.tmpl
new file mode 100644
index 000000000..c6d962b4f
--- /dev/null
+++ b/template/en/default/request/queue.csv.tmpl
@@ -0,0 +1,46 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0. #%]
+
+[% PROCESS "global/field-descs.none.tmpl" %]
+
+[% column_headers = {
+  "type"            => "Flag",
+  "status"          => field_descs.bug_status,
+  "bug_summary"     => field_descs.short_desc,
+  "bug_id"          => field_descs.bug_id,
+  "attach_summary"  => "Attachment Description",
+  "attach_id"       => "Attachment ID",
+  "requester"       => "Requester",
+  "requestee"       => "Requestee",
+  "created"         => "Created",
+  "category"        => field_descs.product _ ": " _ field_descs.component,
+} %]
+
+[% display_columns = ["requester", "requestee", "type", "status",
+                      "bug_id", "bug_summary", "attach_id",
+                      "attach_summary", "created", "category"] %]
+
+[% IF requests.size == 0 %]
+No requests.
+[% ELSE %]
+  [% FOREACH column = display_columns %]
+    [% column_headers.$column FILTER csv %][% ',' IF NOT loop.last() %]
+  [% END %]
+
+  [% FOREACH request = requests %]
+    [% FOREACH column = display_columns %]
+      [% IF column == 'created' %]
+        [% request.$column FILTER time FILTER csv %]
+      [% ELSIF column.match('^requeste') %]
+        [% request.$column FILTER email FILTER csv %]
+      [% ELSE %]
+        [% request.$column FILTER csv %]
+      [% END %][% ',' IF NOT loop.last() %]
+    [% END %]
+
+  [% END %]
+[% END %]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index c2dc9809a..676e89264 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -207,6 +207,8 @@ to some group are shown by default.
     </tr>
   [% END %]
   [% PROCESS display_buglist %]
+  <br><br>
+  <a href="request.cgi?[% urlquerypart FILTER html %]&amp;ctype=csv">View entire list as CSV</a>
 [% END %]
 
 [% PROCESS global/footer.html.tmpl %]
@@ -264,6 +266,6 @@ to some group are shown by default.
   </table>
   [% NEXT UNLESS buglist.keys.size %]
   <a href="buglist.cgi?bug_id=
-           [%- buglist.keys.nsort.join(",") FILTER html %]">(view as
-  [%+ terms.bug %] list)</a>
+           [%- buglist.keys.nsort.join(",") FILTER html %]">View as
+  [%+ terms.bug %] list</a>
 [% END %]

From 4a08422d74d7a8fa08cc94bd209c7ff7d3b7c48f Mon Sep 17 00:00:00 2001
From: Gervase Markham <gerv@gerv.net>
Date: Wed, 2 Jan 2013 17:58:34 +0000
Subject: [PATCH 016/240] Bug 801664 - Add DATE type for custom fields.
 r=LpSolit.

---
 Bugzilla/Bug.pm                                | 18 ++++++++++++++++--
 Bugzilla/Constants.pm                          |  8 +++++++-
 Bugzilla/DB/Schema/Mysql.pm                    |  2 +-
 Bugzilla/DB/Schema/Oracle.pm                   |  2 +-
 Bugzilla/DB/Schema/Pg.pm                       |  2 +-
 Bugzilla/DB/Schema/Sqlite.pm                   |  1 +
 Bugzilla/Field.pm                              | 10 ++++++----
 Bugzilla/Migrate.pm                            |  7 +++++--
 Bugzilla/Search.pm                             |  9 +++++++++
 Bugzilla/WebService/Bug.pm                     |  4 +++-
 importxml.pl                                   |  9 +++++++++
 template/en/default/bug/field.html.tmpl        |  5 +++--
 .../en/default/global/field-descs.none.tmpl    |  1 +
 template/en/default/search/field.html.tmpl     |  2 +-
 14 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index c58fec460..6680ede55 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -146,6 +146,9 @@ sub VALIDATORS {
         elsif ($field->type == FIELD_TYPE_DATETIME) {
             $validator = \&_check_datetime_field;
         }
+        elsif ($field->type == FIELD_TYPE_DATE) {
+            $validator = \&_check_date_field;
+        }
         elsif ($field->type == FIELD_TYPE_FREETEXT) {
             $validator = \&_check_freetext_field;
         }
@@ -233,7 +236,9 @@ use constant NUMERIC_COLUMNS => qw(
 );
 
 sub DATE_COLUMNS {
-    my @fields = @{ Bugzilla->fields({ type => FIELD_TYPE_DATETIME }) };
+    my @fields = (@{ Bugzilla->fields({ type => [FIELD_TYPE_DATETIME,
+                                                 FIELD_TYPE_DATE] })
+                   });
     return map { $_->name } @fields;
 }
 
@@ -1983,8 +1988,13 @@ sub _check_field_is_mandatory {
     }
 }
 
+sub _check_date_field {
+    my ($invocant, $date) = @_;
+    return _check_datetime_field($invocant, $date, 1);
+}
+
 sub _check_datetime_field {
-    my ($invocant, $date_time) = @_;
+    my ($invocant, $date_time, $date_only) = @_;
 
     # Empty datetimes are empty strings or strings only containing
     # 0's, whitespace, and punctuation.
@@ -1998,6 +2008,10 @@ sub _check_datetime_field {
         ThrowUserError('illegal_date', { date   => $date,
                                          format => 'YYYY-MM-DD' });
     }
+    if ($time && $date_only) {
+        ThrowUserError('illegal_date', { date   => $date_time,
+                                         format => 'YYYY-MM-DD' });
+    }
     if ($time && !validate_time($time)) {
         ThrowUserError('illegal_time', { 'time' => $time,
                                          format => 'HH:MM:SS' });
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 8410ae46a..212816a05 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -104,10 +104,12 @@ use Memoize;
     FIELD_TYPE_MULTI_SELECT
     FIELD_TYPE_TEXTAREA
     FIELD_TYPE_DATETIME
+    FIELD_TYPE_DATE
     FIELD_TYPE_BUG_ID
     FIELD_TYPE_BUG_URLS
     FIELD_TYPE_KEYWORDS
-
+    FIELD_TYPE_HIGHEST_PLUS_ONE
+    
     EMPTY_DATETIME_REGEX
 
     ABNORMAL_SELECTS
@@ -385,6 +387,10 @@ use constant FIELD_TYPE_DATETIME  => 5;
 use constant FIELD_TYPE_BUG_ID  => 6;
 use constant FIELD_TYPE_BUG_URLS => 7;
 use constant FIELD_TYPE_KEYWORDS => 8;
+use constant FIELD_TYPE_DATE => 9;
+# Add new field types above this line, and change the below value in the
+# obvious fashion
+use constant FIELD_TYPE_HIGHEST_PLUS_ONE => 10;
 
 use constant EMPTY_DATETIME_REGEX => qr/^[0\-:\sA-Za-z]+$/; 
 
diff --git a/Bugzilla/DB/Schema/Mysql.pm b/Bugzilla/DB/Schema/Mysql.pm
index d44864791..9d634243f 100644
--- a/Bugzilla/DB/Schema/Mysql.pm
+++ b/Bugzilla/DB/Schema/Mysql.pm
@@ -106,7 +106,7 @@ sub _initialize {
         LONGBLOB =>     'longblob',
 
         DATETIME =>     'datetime',
-
+        DATE     =>     'date',
     };
 
     $self->_adjust_schema;
diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm
index 275027954..1bed5b5ca 100644
--- a/Bugzilla/DB/Schema/Oracle.pm
+++ b/Bugzilla/DB/Schema/Oracle.pm
@@ -56,7 +56,7 @@ sub _initialize {
         LONGBLOB =>     'blob',
 
         DATETIME =>     'date',
-
+        DATE     =>     'date',
     };
 
     $self->_adjust_schema;
diff --git a/Bugzilla/DB/Schema/Pg.pm b/Bugzilla/DB/Schema/Pg.pm
index 206a53def..fa784ef7d 100644
--- a/Bugzilla/DB/Schema/Pg.pm
+++ b/Bugzilla/DB/Schema/Pg.pm
@@ -66,7 +66,7 @@ sub _initialize {
         LONGBLOB =>     'bytea',
 
         DATETIME =>     'timestamp(0) without time zone',
-
+        DATE     =>     'date',
     };
 
     $self->_adjust_schema;
diff --git a/Bugzilla/DB/Schema/Sqlite.pm b/Bugzilla/DB/Schema/Sqlite.pm
index 893e2387d..b29d7da22 100644
--- a/Bugzilla/DB/Schema/Sqlite.pm
+++ b/Bugzilla/DB/Schema/Sqlite.pm
@@ -46,6 +46,7 @@ sub _initialize {
         LONGBLOB =>     'blob',
 
         DATETIME =>     'DATETIME',
+        DATE     =>     'DATETIME',
     };
 
     $self->_adjust_schema;
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 14888287a..c85d43bb8 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -151,6 +151,7 @@ use constant SQL_DEFINITIONS => {
     FIELD_TYPE_TEXTAREA,      { TYPE => 'MEDIUMTEXT', 
                                 NOTNULL => 1, DEFAULT => "''"},
     FIELD_TYPE_DATETIME,      { TYPE => 'DATETIME'   },
+    FIELD_TYPE_DATE,          { TYPE => 'DATE'       },
     FIELD_TYPE_BUG_ID,        { TYPE => 'INT3'       },
 };
 
@@ -349,9 +350,7 @@ sub _check_sortkey {
 sub _check_type {
     my ($invocant, $type, undef, $params) = @_;
     my $saved_type = $type;
-    # The constant here should be updated every time a new,
-    # higher field type is added.
-    (detaint_natural($type) && $type <= FIELD_TYPE_KEYWORDS)
+    (detaint_natural($type) && $type < FIELD_TYPE_HIGHEST_PLUS_ONE)
       || ThrowCodeError('invalid_customfield_type', { type => $saved_type });
 
     my $custom = blessed($invocant) ? $invocant->custom : $params->{custom};
@@ -952,7 +951,10 @@ sub remove_from_db {
     }
     else {
         $bugs_query = "SELECT COUNT(*) FROM bugs WHERE $name IS NOT NULL";
-        if ($self->type != FIELD_TYPE_BUG_ID && $self->type != FIELD_TYPE_DATETIME) {
+        if ($self->type != FIELD_TYPE_BUG_ID
+            && $self->type != FIELD_TYPE_DATE
+            && $self->type != FIELD_TYPE_DATETIME)
+        {
             $bugs_query .= " AND $name != ''";
         }
         # Ignore the default single select value
diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm
index 6671ac375..6f3570fd3 100644
--- a/Bugzilla/Migrate.pm
+++ b/Bugzilla/Migrate.pm
@@ -447,8 +447,11 @@ sub translate_value {
     }
 
     my $field_obj = $self->bug_fields->{$field};
-    if ($field eq 'creation_ts' or $field eq 'delta_ts'
-        or ($field_obj and $field_obj->type == FIELD_TYPE_DATETIME))
+    if ($field eq 'creation_ts'
+        or $field eq 'delta_ts'
+        or ($field_obj and
+             ($field_obj->type == FIELD_TYPE_DATETIME
+              or $field_obj->type == FIELD_TYPE_DATE)))
     {
         $value = trim($value);
         return undef if !$value;
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index b9c37b4ed..71893a5fc 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -108,6 +108,7 @@ use Storable qw(dclone);
 
 # When doing searches, NULL datetimes are treated as this date.
 use constant EMPTY_DATETIME => '1970-01-01 00:00:00';
+use constant EMPTY_DATE     => '1970-01-01';
 
 # This is the regex for real numbers from Regexp::Common, modified to be
 # more readable.
@@ -310,6 +311,7 @@ use constant OPERATOR_FIELD_OVERRIDE => {
     FIELD_TYPE_FREETEXT, { _non_changed => \&_nullable },
     FIELD_TYPE_BUG_ID,   { _non_changed => \&_nullable_int },
     FIELD_TYPE_DATETIME, { _non_changed => \&_nullable_datetime },
+    FIELD_TYPE_DATE,     { _non_changed => \&_nullable_date },
     FIELD_TYPE_TEXTAREA, { _non_changed => \&_nullable },
     FIELD_TYPE_MULTI_SELECT, MULTI_SELECT_OVERRIDE,
     FIELD_TYPE_BUG_URLS,     MULTI_SELECT_OVERRIDE,    
@@ -2511,6 +2513,13 @@ sub _nullable_datetime {
     $args->{full_field} = "COALESCE($field, $empty)";
 }
 
+sub _nullable_date {
+    my ($self, $args) = @_;
+    my $field = $args->{full_field};
+    my $empty = Bugzilla->dbh->quote(EMPTY_DATE);
+    $args->{full_field} = "COALESCE($field, $empty)";
+}
+
 sub _deadline {
     my ($self, $args) = @_;
     my $field = $args->{full_field};
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 709983389..fe102f70d 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -929,7 +929,9 @@ sub _bug_to_hash {
         if ($field->type == FIELD_TYPE_BUG_ID) {
             $item{$name} = $self->type('int', $bug->$name);
         }
-        elsif ($field->type == FIELD_TYPE_DATETIME) {
+        elsif ($field->type == FIELD_TYPE_DATETIME
+               || $field->type == FIELD_TYPE_DATE)
+        {
             $item{$name} = $self->type('dateTime', $bug->$name);
         }
         elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
diff --git a/importxml.pl b/importxml.pl
index 92a85c6da..4e78f093f 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -1023,6 +1023,15 @@ sub process_bug {
                 push(@query, $custom_field);
                 push(@values, $value);
             }
+        } elsif ($field->type == FIELD_TYPE_DATE) {
+            eval { $value = Bugzilla::Bug->_check_date_field($value); };
+            if ($@) {
+                $err .= "Skipping illegal value \"$value\" in $custom_field.\n" ;
+            }
+            else {
+                push(@query, $custom_field);
+                push(@values, $value);
+            }
         } else {
             $err .= "Type of custom field $custom_field is an unhandled FIELD_TYPE: " .
                     $field->type . "\n";
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 4255b1702..ef4d0e8b1 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -41,8 +41,9 @@
                value="[% value FILTER html %]" size="40"
                maxlength="[% constants.MAX_FREETEXT_LENGTH FILTER none %]"
                [% ' aria-required="true"' IF field.is_mandatory %]>
-    [% CASE constants.FIELD_TYPE_DATETIME %]
-      <input name="[% field.name FILTER html %]" size="20"
+    [% CASE [constants.FIELD_TYPE_DATETIME, constants.FIELD_TYPE_DATE] %]
+      [% size = (field.type == constants.FIELD_TYPE_DATE) ? 10 : 20 %]
+      <input name="[% field.name FILTER html %]" size="[% size FILTER none %]"
              id="[% field.name FILTER html %]"
              value="[% value FILTER html %]"
              [% ' aria-required="true"' IF field.is_mandatory %]
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index f1e0747da..948ee5efa 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -43,6 +43,7 @@
                    ${constants.FIELD_TYPE_MULTI_SELECT}  => "Multiple-Selection Box",
                    ${constants.FIELD_TYPE_TEXTAREA}      => "Large Text Box",
                    ${constants.FIELD_TYPE_DATETIME}      => "Date/Time",
+                   ${constants.FIELD_TYPE_DATE}          => "Date",
                    ${constants.FIELD_TYPE_BUG_ID}        => "$terms.Bug ID",
                 } %]
 
diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index ab7380857..dc1592e38 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -52,7 +52,7 @@
       YAHOO.bugzilla.fieldAutocomplete.init('[% field.name FILTER js %]',
                                             '[% field.name FILTER js %]_autocomplete');
     </script>
-  [% CASE constants.FIELD_TYPE_DATETIME %]
+  [% CASE [constants.FIELD_TYPE_DATETIME, constants.FIELD_TYPE_DATE] %]
     [% INCLUDE "bug/field-label.html.tmpl"
       field = field
       tag_name = "span"

From 80121ab939acfe9eaf46a20f9cc0dd27103234cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 2 Jan 2013 19:44:44 +0100
Subject: [PATCH 017/240] Fix bustage due to bug 801664

---
 Bugzilla/Bug.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 6680ede55..7c7e0fb37 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1990,11 +1990,11 @@ sub _check_field_is_mandatory {
 
 sub _check_date_field {
     my ($invocant, $date) = @_;
-    return _check_datetime_field($invocant, $date, 1);
+    return $invocant->_check_datetime_field($date, undef, {date_only => 1});
 }
 
 sub _check_datetime_field {
-    my ($invocant, $date_time, $date_only) = @_;
+    my ($invocant, $date_time, $field, $params) = @_;
 
     # Empty datetimes are empty strings or strings only containing
     # 0's, whitespace, and punctuation.
@@ -2008,7 +2008,7 @@ sub _check_datetime_field {
         ThrowUserError('illegal_date', { date   => $date,
                                          format => 'YYYY-MM-DD' });
     }
-    if ($time && $date_only) {
+    if ($time && $params->{date_only}) {
         ThrowUserError('illegal_date', { date   => $date_time,
                                          format => 'YYYY-MM-DD' });
     }

From b2d6b2d330ffd6172b02d19033683fbf48510435 Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Thu, 3 Jan 2013 13:23:12 +0100
Subject: [PATCH 018/240] Bug 824616: The urlbase field in
 global/header.html.tmpl must be filtered r/a=LpSolit

---
 template/en/default/global/header.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 97ccbefab..83816c97e 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -234,7 +234,7 @@
   #%]
 
   <body onload="[% onload %]"
-        class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') %]
+        class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') FILTER css_class_quote %]
                [% FOREACH class = bodyclasses %]
                  [% ' ' %][% class FILTER css_class_quote %]
                [% END %] yui-skin-sam">

From d840a4097b3fc9405a6197ad67f9b19a35d334a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 3 Jan 2013 14:45:13 +0100
Subject: [PATCH 019/240] Bug 824262: Querying for strings in comments is now
 ultra slow r=glob a=LpSolit

---
 Bugzilla/Search.pm | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 71893a5fc..b05da1a04 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1915,13 +1915,24 @@ sub _quote_unless_numeric {
 
 sub build_subselect {
     my ($outer, $inner, $table, $cond, $negate) = @_;
-    # Execute subselects immediately to avoid dependent subqueries, which are
-    # large performance hits on MySql
-    my $q = "SELECT DISTINCT $inner FROM $table WHERE $cond";
-    my $dbh = Bugzilla->dbh;
-    my $list = $dbh->selectcol_arrayref($q);
-    return $negate ? "1=1" : "1=2" unless @$list;
-    return $dbh->sql_in($outer, $list, $negate);
+
+    if ($table eq 'longdescs') {
+        # There is no index on the longdescs.thetext column and so it takes
+        # a long time to scan the whole table unconditionally. For this table,
+        # we return the subselect and let the DB optimizer restrict the search
+        # to some given bug list only based on other search criteria available.
+        my $not = $negate ? "NOT" : "";
+        return "$outer $not IN (SELECT DISTINCT $inner FROM $table WHERE $cond)";
+    }
+    else {
+        # Execute subselects immediately to avoid dependent subqueries, which are
+        # large performance hits on MySql
+        my $q = "SELECT DISTINCT $inner FROM $table WHERE $cond";
+        my $dbh = Bugzilla->dbh;
+        my $list = $dbh->selectcol_arrayref($q);
+        return $negate ? "1=1" : "1=2" unless @$list;
+        return $dbh->sql_in($outer, $list, $negate);
+    }
 }
 
 # Used by anyexact to get the list of input values. This allows us to

From de8d85255c72464735de34eaad056a9415d1b2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sun, 6 Jan 2013 00:24:23 +0100
Subject: [PATCH 020/240] Bug 826678: Disable warnings about the deprecated
 Return::Value module when loading Email::Send r=wicked a=LpSolit

---
 Bugzilla/Config/MTA.pm           | 6 ++++++
 Bugzilla/Install/Requirements.pm | 7 +++++++
 Bugzilla/Mailer.pm               | 6 ++++++
 3 files changed, 19 insertions(+)

diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index a6ca36613..2f4af72f4 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -11,6 +11,12 @@ use 5.10.1;
 use strict;
 
 use Bugzilla::Config::Common;
+# Return::Value 1.666002 pollutes the error log with warnings about this
+# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send
+# to disable these warnings.
+BEGIN {
+    $Return::Value::NO_CLUCK = 1;
+}
 use Email::Send;
 
 our $sortkey = 1200;
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 9bc5be14a..eb36d15a6 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -23,6 +23,13 @@ use List::Util qw(max);
 use Safe;
 use Term::ANSIColor;
 
+# Return::Value 1.666002 pollutes the error log with warnings about this
+# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send
+# in have_vers() to disable these warnings.
+BEGIN {
+    $Return::Value::NO_CLUCK = 1;
+}
+
 use parent qw(Exporter);
 our @EXPORT = qw(
     REQUIRED_MODULES
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index d9aa9edc9..6602c6cef 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -24,6 +24,12 @@ use Encode qw(encode);
 use Encode::MIME::Header;
 use Email::Address;
 use Email::MIME;
+# Return::Value 1.666002 pollutes the error log with warnings about this
+# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send
+# to disable these warnings.
+BEGIN {
+    $Return::Value::NO_CLUCK = 1;
+}
 use Email::Send;
 
 sub MessageToMTA {

From e7d695a972afdbfbcd645eb7e05b19611e5a80d5 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 7 Jan 2013 13:46:38 +0800
Subject: [PATCH 021/240] Bug 825718: Fix Bugzilla::Bug->check() wrt caching
 mechanism r=LpSolit,r=LpSolit

---
 Bugzilla/Bug.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 7c7e0fb37..4485b620c 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -372,14 +372,16 @@ sub cache_key {
 
 sub check {
     my $class = shift;
-    my ($id, $field) = @_;
-
-    ThrowUserError('improper_bug_id_field_value', { field => $field }) unless defined $id;
+    my ($param, $field) = @_;
 
     # Bugzilla::Bug throws lots of special errors, so we don't call
     # SUPER::check, we just call our new and do our own checks.
-    $id = trim($id);
-    my $self = $class->new($id);
+    my $id = ref($param)
+        ? ($param->{id} = trim($param->{id}))
+        : ($param = trim($param));
+    ThrowUserError('improper_bug_id_field_value', { field => $field }) unless defined $id;
+
+    my $self = $class->new($param);
 
     if ($self->{error}) {
         # For error messages, use the id that was returned by new(), because

From 2623115577cfabf6a3dac7bd7c1ecdba706cbade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 7 Jan 2013 21:11:53 +0100
Subject: [PATCH 022/240] Bug 824361: Add an index on (bug_id, work_time) in
 the longdescs table to improve performance r=dkl a=LpSolit

---
 Bugzilla/DB/Schema.pm  |  2 +-
 Bugzilla/Install/DB.pm | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 7c3f9fa6c..058e78a5f 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -400,7 +400,7 @@ use constant ABSTRACT_SCHEMA => {
             extra_data      => {TYPE => 'varchar(255)'}
         ],
         INDEXES => [
-            longdescs_bug_id_idx   => ['bug_id'],
+            longdescs_bug_id_idx   => [qw(bug_id work_time)],
             longdescs_who_idx     => [qw(who bug_id)],
             longdescs_bug_when_idx => ['bug_when'],
         ],
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index e1a3f3630..cb7276fb9 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -705,6 +705,9 @@ sub update_table_definitions {
     # 2012-12-29 reed@reedloden.com - Bug 785283
     _add_password_salt_separator();
 
+    # 2013-01-02 LpSolit@gmail.com - Bug 824361
+    _fix_longdescs_indexes();
+
     ################################################################
     # New --TABLE-- changes should go *** A B O V E *** this point #
     ################################################################
@@ -3734,6 +3737,15 @@ sub _fix_longdescs_primary_key {
     }
 }
 
+sub _fix_longdescs_indexes {
+    my $dbh = Bugzilla->dbh;
+    my $bug_id_idx = $dbh->bz_index_info('longdescs', 'longdescs_bug_id_idx');
+    if ($bug_id_idx && scalar @{$bug_id_idx->{'FIELDS'}} < 2) {
+        $dbh->bz_drop_index('longdescs', 'longdescs_bug_id_idx');
+        $dbh->bz_add_index('longdescs', 'longdescs_bug_id_idx', [qw(bug_id work_time)]);
+    }
+}
+
 sub _fix_dependencies_dupes {
     my $dbh = Bugzilla->dbh;
     my $blocked_idx = $dbh->bz_index_info('dependencies', 'dependencies_blocked_idx');

From dc2260f5754081a1efdd58cb408a0eda2a83d6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sat, 12 Jan 2013 14:30:56 +0100
Subject: [PATCH 023/240] Bug 787668 #2: Use |use parent| instead of |use base|

---
 Bugzilla/Search/ClauseGroup.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/Search/ClauseGroup.pm b/Bugzilla/Search/ClauseGroup.pm
index 1085ad82c..a50dc4fb3 100644
--- a/Bugzilla/Search/ClauseGroup.pm
+++ b/Bugzilla/Search/ClauseGroup.pm
@@ -10,7 +10,7 @@ package Bugzilla::Search::ClauseGroup;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Search::Clause);
+use parent qw(Bugzilla::Search::Clause);
 
 use Bugzilla::Error;
 use Bugzilla::Search::Condition qw(condition);

From 96a4bb1e3a3f98ac6381426631f75441c0b273de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 14 Jan 2013 18:42:59 +0100
Subject: [PATCH 024/240] Bug 829852: Requirements.pm no longer uses Safe
 r=glob a=LpSolit

---
 Bugzilla/Install/Requirements.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index eb36d15a6..e04701250 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -20,7 +20,6 @@ use Bugzilla::Constants;
 use Bugzilla::Install::Util qw(vers_cmp install_string bin_loc 
                                extension_requirement_packages);
 use List::Util qw(max);
-use Safe;
 use Term::ANSIColor;
 
 # Return::Value 1.666002 pollutes the error log with warnings about this

From 5647131d04d3e35531fae6b805b7003049676ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 14 Jan 2013 18:46:47 +0100
Subject: [PATCH 025/240] Bug 829709: Do not load CSS files from all skins by
 default r=dkl a=LpSolit

---
 Bugzilla/Template.pm                        | 49 ++++++---------------
 template/en/default/global/header.html.tmpl | 44 ++++--------------
 2 files changed, 21 insertions(+), 72 deletions(-)

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index dc064d8bb..3e883c790 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -419,13 +419,10 @@ sub mtime_filter {
 #
 #  1. YUI CSS
 #  2. Standard Bugzilla stylesheet set (persistent)
-#  3. Standard Bugzilla stylesheet set (selectable)
-#  4. All third-party "skin" stylesheet sets (selectable)
-#  5. Page-specific styles
-#  6. Custom Bugzilla stylesheet set (persistent)
-#
-# "Selectable" skin file sets may be either preferred or alternate.
-# Exactly one is preferred, determined by the "skin" user preference.
+#  3. Third-party "skin" stylesheet set, per user prefs (persistent)
+#  4. Page-specific styles
+#  5. Custom Bugzilla stylesheet set (persistent)
+
 sub css_files {
     my ($style_urls, $yui, $yui_css) = @_;
     
@@ -442,18 +439,10 @@ sub css_files {
     
     my @css_sets = map { _css_link_set($_) } @requested_css;
     
-    my %by_type = (standard => [], alternate => {}, skin => [], custom => []);
+    my %by_type = (standard => [], skin => [], custom => []);
     foreach my $set (@css_sets) {
         foreach my $key (keys %$set) {
-            if ($key eq 'alternate') {
-                foreach my $alternate_skin (keys %{ $set->{alternate} }) {
-                    my $files = $by_type{alternate}->{$alternate_skin} ||= [];
-                    push(@$files, $set->{alternate}->{$alternate_skin});
-                }
-            }
-            else {
-                push(@{ $by_type{$key} }, $set->{$key});
-            }
+            push(@{ $by_type{$key} }, $set->{$key});
         }
     }
     
@@ -470,27 +459,15 @@ sub _css_link_set {
     if ($file_name !~ m{(^|/)skins/standard/}) {
         return \%set;
     }
-    
-    my $skin_user_prefs = Bugzilla->user->settings->{skin};
+
+    my $skin = Bugzilla->user->settings->{skin}->{value};
     my $cgi_path = bz_locations()->{'cgi_path'};
-    # If the DB is not accessible, user settings are not available.
-    my $all_skins = $skin_user_prefs ? $skin_user_prefs->legal_values : [];
-    my %skin_urls;
-    foreach my $option (@$all_skins) {
-        next if $option eq 'standard';
-        my $skin_file_name = $file_name;
-        $skin_file_name =~ s{(^|/)skins/standard/}{skins/contrib/$option/};
-        if (my $mtime = _mtime("$cgi_path/$skin_file_name")) {
-            $skin_urls{$option} = mtime_filter($skin_file_name, $mtime);
-        }
+    my $skin_file_name = $file_name;
+    $skin_file_name =~ s{(^|/)skins/standard/}{skins/contrib/$skin/};
+    if (my $mtime = _mtime("$cgi_path/$skin_file_name")) {
+        $set{skin} = mtime_filter($skin_file_name, $mtime);
     }
-    $set{alternate} = \%skin_urls;
-    
-    my $skin = $skin_user_prefs->{'value'};
-    if ($skin ne 'standard' and defined $set{alternate}->{$skin}) {
-        $set{skin} = delete $set{alternate}->{$skin};
-    }
-    
+
     my $custom_file_name = $file_name;
     $custom_file_name =~ s{(^|/)skins/standard/}{skins/custom/};
     if (my $custom_mtime = _mtime("$cgi_path/$custom_file_name")) {
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 83816c97e..0858edd98 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -22,10 +22,6 @@
   # atomlink: Atom link URL, May contain HTML
   #%]
 
-[% IF message %]
-  [% PROCESS global/messages.html.tmpl %]
-[% END %]
-
 [% DEFAULT
   subheader = ""
   header_addl_info = ""
@@ -95,12 +91,8 @@
     [% SET yui = yui_resolve_deps(yui, yui_deps) %]
     [% SET css_sets = css_files(style_urls, yui, yui_css) %]
 
-    [%# CSS cascade, part 1: Standard Bugzilla stylesheet set (persistent).
-      # Always present.
-      #%]
-    [%# This allows people to switch back to the "Classic" skin if they
-      # are in another skin. 
-      #%]
+    [%# CSS cascade, parts 1 & 2: YUI & Standard Bugzilla stylesheet set (persistent).
+      # Always present. %]
     <link href="[% 'skins/standard/global.css' FILTER mtime FILTER html %]"
           rel="alternate stylesheet" 
           title="[% setting_descs.standard FILTER html %]">
@@ -108,22 +100,12 @@
       [% PROCESS format_css_link css_set_name = 'standard' %]
     [% END %]
 
-    [%# CSS cascade, part 2 & 3: Third-party stylesheet set (selected and
-      # selectable). All third-party skins are present as alternate
-      # stylesheets, even if they are not currently in use.
-      #%]
+    [%# CSS cascade, part 3: Third-party stylesheet set, per user prefs. %]
     [% FOREACH style_url = css_sets.skin %]
       [% PROCESS format_css_link css_set_name = user.settings.skin.value %]
     [% END %]
 
-    [% FOREACH alternate_skin = css_sets.alternate.keys %]
-      [% FOREACH style_url = css_sets.alternate.$alternate_skin %]
-        [% PROCESS format_css_link css_set_name = alternate_skin %]
-      [% END %]
-    [% END %]
-
-    [%# CSS cascade, part 4: page-specific styles.
-      #%]
+    [%# CSS cascade, part 4: page-specific styles. %]
     [% IF style %]
       <style type="text/css">
         [% style %]
@@ -296,7 +278,8 @@
 [% END %]
 
 [% IF message %]
-<div id="message">[% message %]</div>
+  [% PROCESS global/messages.html.tmpl %]
+  <div id="message">[% message %]</div>
 [% END %]
 
 [% BLOCK format_css_link %]
@@ -308,26 +291,15 @@
         #%]
   [% END %]
 
-  [% IF css_set_name == 'standard'
-       OR css_set_name == user.settings.skin.value
-  %]
-    [% SET css_rel = 'stylesheet' %]
-    [% SET css_set_display_name = setting_descs.${user.settings.skin.value}
-                                  || user.settings.skin.value %]
-  [% ELSE %]
-    [% SET css_rel = 'alternate stylesheet' %]
-    [% SET css_set_display_name = setting_descs.$css_set_name || css_set_name %]
-  [% END %]
-
   [% IF css_set_name == 'standard' %]
     [% SET css_title_link = '' %]
   [% ELSE %]
     [% css_title_link = BLOCK ~%]
-      title="[% css_set_display_name FILTER html %]"
+      title="[% setting_descs.${user.settings.skin.value} || user.settings.skin.value FILTER html %]"
     [% END %]
   [% END %]
 
-  <link href="[% style_url FILTER html %]" rel="[% css_rel FILTER none %]"
+  <link href="[% style_url FILTER html %]" rel="stylesheet"
         type="text/css" [% css_title_link FILTER none %]>
 
   [% '<![endif]-->' IF style_url.match('/IE-fixes\.css') %]

From c95d855a5bd5078256ec369c16fb35601f117f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 14 Jan 2013 18:50:53 +0100
Subject: [PATCH 026/240] Bug 829939: Only build default_authorizer on request
 r=glob a=LpSolit

---
 Bugzilla/Template.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 3e883c790..b93e1bfae 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -982,7 +982,7 @@ sub create {
                 }
                 return \@optional;
             },
-            'default_authorizer' => new Bugzilla::Auth(),
+            'default_authorizer' => sub { return Bugzilla::Auth->new() },
         },
     };
     # Use a per-process provider to cache compiled templates in memory across

From fd01023e75746d00ca24f9938afee93c3cbc6519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 14 Jan 2013 18:55:35 +0100
Subject: [PATCH 027/240] Bug 830373: Remove the unused global/help.html.tmpl
 template r=wicked a=LpSolit

---
 template/en/default/global/footer.html.tmpl |  2 --
 template/en/default/global/help.html.tmpl   | 20 --------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 template/en/default/global/help.html.tmpl

diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index cf6a39967..0e98d9efc 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -11,8 +11,6 @@
   # global/useful-links.html.tmpl.
   #%]
 
-[% INCLUDE "global/help.html.tmpl" %]
-
 </div>
 
 [%# Migration note: below this point, this file corresponds to the old Param
diff --git a/template/en/default/global/help.html.tmpl b/template/en/default/global/help.html.tmpl
deleted file mode 100644
index 89adff7ef..000000000
--- a/template/en/default/global/help.html.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
-[% IF cgi.param("help") %]
-  <script type="text/javascript"> <!--
-    [% FOREACH help_name = help_html.keys %]
-      g_helpTexts["[% help_name FILTER js %]"] = 
-        "[%- help_html.$help_name FILTER js -%]";
-    [% END %]
-    // -->
-  </script>
-[% END %]

From 8d3a4f703f31d6c25e46eb032f1b3c215ee2b31f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 14 Jan 2013 18:59:54 +0100
Subject: [PATCH 028/240] Bug 829601: Bugzilla->local_timezone should be stored
 in process_cache instead of request_cache r=glob a=LpSolit

---
 Bugzilla.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index e06b67ead..985834876 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -596,7 +596,7 @@ sub has_flags {
 }
 
 sub local_timezone {
-    return $_[0]->request_cache->{local_timezone}
+    return $_[0]->process_cache->{local_timezone}
              ||= DateTime::TimeZone->new(name => 'local');
 }
 

From 57b8c94bbe0fb006f863a3b6fef6a069c4a1fd38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 15 Jan 2013 17:58:30 +0100
Subject: [PATCH 029/240] Fix bustage

---
 template/en/default/global/header.html.tmpl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 0858edd98..dceb44db9 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -22,6 +22,10 @@
   # atomlink: Atom link URL, May contain HTML
   #%]
 
+[% IF message %]
+  [% PROCESS global/messages.html.tmpl %]
+[% END %]
+
 [% DEFAULT
   subheader = ""
   header_addl_info = ""
@@ -278,7 +282,6 @@
 [% END %]
 
 [% IF message %]
-  [% PROCESS global/messages.html.tmpl %]
   <div id="message">[% message %]</div>
 [% END %]
 

From 2757ea0124b8eff80af42b31808bdae2cf6a274c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 16 Jan 2013 19:05:22 +0100
Subject: [PATCH 030/240] Bug 819432: Execute queries in two steps to improve
 performance r=dkl a=LpSolit

---
 Bugzilla/Search.pm                           | 180 ++++++++++++++++++-
 buglist.cgi                                  |  42 ++---
 collectstats.pl                              |   3 +-
 report.cgi                                   |   7 +-
 template/en/default/list/list.html.tmpl      |  11 +-
 template/en/default/reports/report.html.tmpl |   4 +-
 whine.pl                                     |   9 +-
 xt/lib/Bugzilla/Test/Search/FieldTest.pm     |  11 +-
 8 files changed, 218 insertions(+), 49 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index b05da1a04..1c6af782e 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -32,9 +32,10 @@ use Data::Dumper;
 use Date::Format;
 use Date::Parse;
 use Scalar::Util qw(blessed);
-use List::MoreUtils qw(all part uniq);
+use List::MoreUtils qw(all firstidx part uniq);
 use POSIX qw(INT_MAX);
 use Storable qw(dclone);
+use Time::HiRes qw(gettimeofday tv_interval);
 
 # Description Of Boolean Charts
 # -----------------------------
@@ -686,7 +687,70 @@ sub new {
 # Public Accessors #
 ####################
 
-sub sql {
+sub data {
+    my $self = shift;
+    return $self->{data} if $self->{data};
+    my $dbh = Bugzilla->dbh;
+
+    # If all fields belong to the 'bugs' table, there is no need to split
+    # the original query into two pieces. Else we override the 'fields'
+    # argument to first get bug IDs based on the search criteria defined
+    # by the caller, and the desired fields are collected in the 2nd query.
+    my @orig_fields = $self->_input_columns;
+    my $all_in_bugs_table = 1;
+    foreach my $field (@orig_fields) {
+        next if $self->COLUMNS->{$field}->{name} =~ /^bugs\.\w+$/;
+        $self->{fields} = ['bug_id'];
+        $all_in_bugs_table = 0;
+        last;
+    }
+
+    my $start_time = [gettimeofday()];
+    my $sql = $self->_sql;
+    # Do we just want bug IDs to pass to the 2nd query or all the data immediately?
+    my $func = $all_in_bugs_table ? 'selectall_arrayref' : 'selectcol_arrayref';
+    my $bug_ids = $dbh->$func($sql);
+    my @extra_data = ({sql => $sql, time => tv_interval($start_time)});
+    # Restore the original 'fields' argument, just in case.
+    $self->{fields} = \@orig_fields unless $all_in_bugs_table;
+
+    # If there are no bugs found, or all fields are in the 'bugs' table,
+    # there is no need for another query.
+    if (!scalar @$bug_ids || $all_in_bugs_table) {
+        $self->{data} = $bug_ids;
+        return wantarray ? ($self->{data}, \@extra_data) : $self->{data};
+    }
+
+    # Make sure the bug_id will be returned. If not, append it to the list.
+    my $pos = firstidx { $_ eq 'bug_id' } @orig_fields;
+    if ($pos < 0) {
+        push(@orig_fields, 'bug_id');
+        $pos = $#orig_fields;
+    }
+
+    # Now create a query with the buglist above as the single criteria
+    # and the fields that the caller wants. No need to redo security checks;
+    # the list has already been validated above.
+    my $search = $self->new('fields' => \@orig_fields,
+                            'params' => {bug_id => $bug_ids, bug_id_type => 'anyexact'},
+                            'sharer' => $self->_sharer_id,
+                            'user'   => $self->_user,
+                            'allow_unlimited'    => 1,
+                            '_no_security_check' => 1);
+
+    $start_time = [gettimeofday()];
+    $sql = $search->_sql;
+    my $unsorted_data = $dbh->selectall_arrayref($sql);
+    push(@extra_data, {sql => $sql, time => tv_interval($start_time)});
+    # Let's sort the data. We didn't do it in the query itself because
+    # we already know in which order to sort bugs thanks to the first query,
+    # and this avoids additional table joins in the SQL query.
+    my %data = map { $_->[$pos] => $_ } @$unsorted_data;
+    $self->{data} = [map { $data{$_} } @$bug_ids];
+    return wantarray ? ($self->{data}, \@extra_data) : $self->{data};
+}
+
+sub _sql {
     my ($self) = @_;
     return $self->{sql} if $self->{sql};
     my $dbh = Bugzilla->dbh;
@@ -720,7 +784,7 @@ sub search_description {
     # Make sure that the description has actually been generated if
     # people are asking for the whole thing.
     else {
-        $self->sql;
+        $self->_sql;
     }
     return $self->{'search_description'};
 }
@@ -1116,6 +1180,7 @@ sub _standard_joins {
     my ($self) = @_;
     my $user = $self->_user;
     my @joins;
+    return () if $self->{_no_security_check};
 
     my $security_join = {
         table => 'bug_group_map',
@@ -1192,6 +1257,7 @@ sub _translate_join {
 # group security.
 sub _standard_where {
     my ($self) = @_;
+    return ('1=1') if $self->{_no_security_check};
     # If replication lags badly between the shadow db and the main DB,
     # it's possible for bugs to show up in searches before their group
     # controls are properly set. To prevent this, when initially creating
@@ -2960,6 +3026,112 @@ sub _translate_old_column {
 
 1;
 
+__END__
+
+=head1 NAME
+
+Bugzilla::Search - Provides methods to run queries against bugs.
+
+=head1 SYNOPSIS
+
+    use Bugzilla::Search;
+
+    my $search = new Bugzilla::Search({'fields' => \@fields,
+                                       'params' => \%search_criteria,
+                                       'sharer' => $sharer_id,
+                                       'user'   => $user_obj,
+                                       'allow_unlimited' => 1});
+
+    my $data = $search->data;
+    my ($data, $extra_data) = $search->data;
+
+=head1 DESCRIPTION
+
+Search.pm represents a search object. It's the single way to collect
+data about bugs in a secure way. The list of bugs matching criteria
+defined by the caller are filtered based on the user privileges.
+
+=head1 METHODS
+
+=head2 new
+
+=over
+
+=item B<Description>
+
+Create a Bugzilla::Search object.
+
+=item B<Params>
+
+=over
+
+=item C<fields>
+
+An arrayref representing the bug attributes for which data is desired.
+Legal attributes are listed in the fielddefs DB table. At least one field
+must be defined, typically the 'bug_id' field.
+
+=item C<params>
+
+A hashref representing search criteria. Each key => value pair represents
+a search criteria, where the key is the search field and the value is the
+value for this field. At least one search criteria must be defined if the
+'search_allow_no_criteria' parameter is turned off, else an error is thrown.
+
+=item C<sharer>
+
+When a saved search is shared by a user, this is his user ID.
+
+=item C<user>
+
+A L<Bugzilla::User> object representing the user to whom the data is addressed.
+All security checks are done based on this user object, so it's not safe
+to share results of the query with other users as not all users have the
+same privileges or have the same role for all bugs in the list. If this
+parameter is not defined, then the currently logged in user is taken into
+account. If no user is logged in, then only public bugs will be returned.
+
+=item C<allow_unlimited>
+
+If set to a true value, the number of bugs retrieved by the query is not
+limited.
+
+=back
+
+=item B<Returns>
+
+A L<Bugzilla::Search> object.
+
+=back
+
+=head2 data
+
+=over
+
+=item B<Description>
+
+Returns bugs matching search criteria passed to C<new()>.
+
+=item B<Params>
+
+None
+
+=item B<Returns>
+
+In scalar context, this method returns a reference to a list of bugs.
+Each item of the list represents a bug, which is itself a reference to
+a list where each item represents a bug attribute, in the same order as
+specified in the C<fields> parameter of C<new()>.
+
+In list context, this methods also returns a reference to a list containing
+references to hashes. For each hash, two keys are defined: C<sql> contains
+the SQL query which has been executed, and C<time> contains the time spent
+to execute the SQL query, in seconds. There can be either a single hash, or
+two hashes if two SQL queries have been executed sequentially to get all the
+required data.
+
+=back
+
 =head1 B<Methods in need of POD>
 
 =over
@@ -2968,8 +3140,6 @@ sub _translate_old_column {
 
 =item COLUMN_JOINS
 
-=item sql
-
 =item split_order_term
 
 =item SqlifyDate
diff --git a/buglist.cgi b/buglist.cgi
index 8a436a0a2..625b7eab8 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -25,7 +25,6 @@ use Bugzilla::Status;
 use Bugzilla::Token;
 
 use Date::Parse;
-use Time::HiRes qw(gettimeofday tv_interval);
 
 my $cgi = Bugzilla->cgi;
 my $dbh = Bugzilla->dbh;
@@ -667,8 +666,7 @@ my $search = new Bugzilla::Search('fields' => \@selectcolumns,
                                   'params' => scalar $params->Vars,
                                   'order'  => \@order_columns,
                                   'sharer' => $sharer_id);
-my $query = $search->sql;
-$vars->{'search_description'} = $search->search_description;
+
 $order = join(',', $search->order);
 
 if (scalar @{$search->invalid_order_columns}) {
@@ -688,18 +686,6 @@ $params->delete('limit') if $vars->{'default_limited'};
 # Query Execution
 ################################################################################
 
-if ($cgi->param('debug')) {
-    $vars->{'debug'} = 1;
-    $vars->{'query'} = $query;
-    # Explains are limited to admins because you could use them to figure
-    # out how many hidden bugs are in a particular product (by doing
-    # searches and looking at the number of rows the explain says it's
-    # examining).
-    if ($user->in_group('admin')) {
-        $vars->{'query_explain'} = $dbh->bz_explain($query);
-    }
-}
-
 # Time to use server push to display an interim message to the user until
 # the query completes and we can display the bug list.
 if ($serverpush) {
@@ -732,11 +718,25 @@ $::SIG{TERM} = 'DEFAULT';
 $::SIG{PIPE} = 'DEFAULT';
 
 # Execute the query.
-my $start_time = [gettimeofday()];
-my $buglist_sth = $dbh->prepare($query);
-$buglist_sth->execute();
-$vars->{query_time} = tv_interval($start_time);
+my ($data, $extra_data) = $search->data;
+$vars->{'search_description'} = $search->search_description;
 
+if ($cgi->param('debug')) {
+    $vars->{'debug'} = 1;
+    $vars->{'queries'} = $extra_data;
+    my $query_time = 0;
+    $query_time += $_->{'time'} foreach @$extra_data;
+    $vars->{'query_time'} = $query_time;
+    # Explains are limited to admins because you could use them to figure
+    # out how many hidden bugs are in a particular product (by doing
+    # searches and looking at the number of rows the explain says it's
+    # examining).
+    if ($user->in_group('admin')) {
+        foreach my $query (@$extra_data) {
+            $query->{explain} = $dbh->bz_explain($query->{sql});
+        }
+    }
+}
 
 ################################################################################
 # Results Retrieval
@@ -768,14 +768,14 @@ my @bugidlist;
 
 my @bugs; # the list of records
 
-while (my @row = $buglist_sth->fetchrow_array()) {
+foreach my $row (@$data) {
     my $bug = {}; # a record
 
     # Slurp the row of data into the record.
     # The second from last column in the record is the number of groups
     # to which the bug is restricted.
     foreach my $column (@selectcolumns) {
-        $bug->{$column} = shift @row;
+        $bug->{$column} = shift @$row;
     }
 
     # Process certain values further (i.e. date format conversion).
diff --git a/collectstats.pl b/collectstats.pl
index bf0c68696..330fae5b3 100755
--- a/collectstats.pl
+++ b/collectstats.pl
@@ -473,8 +473,7 @@ sub CollectSeriesData {
                                               'fields' => ["bug_id"],
                                               'allow_unlimited' => 1,
                                               'user'   => $user);
-            my $sql = $search->sql;
-            $data = $shadow_dbh->selectall_arrayref($sql);
+            $data = $search->data;
         };
 
         if (!$@) {
diff --git a/report.cgi b/report.cgi
index 69aadddbd..2949a18c3 100755
--- a/report.cgi
+++ b/report.cgi
@@ -164,13 +164,12 @@ my $search = new Bugzilla::Search(
     params => scalar $params->Vars,
     allow_unlimited => 1,
 );
-my $query = $search->sql;
 
 $::SIG{TERM} = 'DEFAULT';
 $::SIG{PIPE} = 'DEFAULT';
 
-my $dbh = Bugzilla->switch_to_shadow_db();
-my $results = $dbh->selectall_arrayref($query);
+Bugzilla->switch_to_shadow_db();
+my ($results, $extra_data) = $search->data;
 
 # We have a hash of hashes for the data itself, and a hash to hold the 
 # row/col/table names.
@@ -257,7 +256,7 @@ if ($formatparam eq "bar") {
 
 $vars->{'width'} = $width;
 $vars->{'height'} = $height;
-$vars->{'query'} = $query;
+$vars->{'queries'} = $extra_data;
 $vars->{'saved_report_id'} = $cgi->param('saved_report_id');
 $vars->{'debug'} = $cgi->param('debug');
 
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 3be607a38..dcc140cf2 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -72,10 +72,13 @@
 
   [% IF debug %]
     <div class="bz_query_debug">
-      <p>[% query FILTER html %]</p>
-      <p>Execution time: [% query_time FILTER html %] seconds</p>
-      [% IF query_explain.defined %]
-        <pre>[% query_explain FILTER html %]</pre>
+      <p>Total execution time: [% query_time FILTER html %] seconds</p>
+      [% FOREACH query = queries %]
+        <p>[% query.sql FILTER html %]</p>
+        <p>Execution time: [% query.time FILTER html %] seconds</p>
+        [% IF query.explain %]
+          <pre>[% query.explain FILTER html %]</pre>
+        [% END %]
       [% END %]
     </div>
   [% END %]
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 8dc4bc5a7..2ca5dd90f 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -61,7 +61,9 @@
 %]
 
 [% IF debug %]
-  <p>[% query FILTER html %]</p>
+  [% FOREACH query = queries %]
+    <p>[% query.sql FILTER html %]</p>
+  [% END %]
 [% END %]
 
 <div align="center">
diff --git a/whine.pl b/whine.pl
index 481b47425..f7ed6d5c7 100755
--- a/whine.pl
+++ b/whine.pl
@@ -453,7 +453,7 @@ sub run_queries {
             'order'  => \@orderstrings
         );
         # If a query fails for whatever reason, it shouldn't kill the script.
-        my $sqlquery = eval { $search->sql };
+        my $data = eval { $search->data };
         if ($@) {
             print STDERR get_text('whine_query_failed', { query_name => $thisquery->{'name'},
                                                           author => $args->{'author'},
@@ -461,15 +461,12 @@ sub run_queries {
             next;
         }
 
-        $sth = $dbh->prepare($sqlquery);
-        $sth->execute;
-
-        while (my @row = $sth->fetchrow_array) {
+        foreach my $row (@$data) {
             my $bug = {};
             for my $field (@searchfields) {
                 my $fieldname = $field;
                 $fieldname =~ s/^bugs\.//;  # No need for bugs.whatever
-                $bug->{$fieldname} = shift @row;
+                $bug->{$fieldname} = shift @$row;
             }
 
             if ($thisquery->{'onemailperbug'}) {
diff --git a/xt/lib/Bugzilla/Test/Search/FieldTest.pm b/xt/lib/Bugzilla/Test/Search/FieldTest.pm
index f8295aa70..c92a6a7b6 100644
--- a/xt/lib/Bugzilla/Test/Search/FieldTest.pm
+++ b/xt/lib/Bugzilla/Test/Search/FieldTest.pm
@@ -530,13 +530,13 @@ sub do_tests {
     my $sql;
     TODO: {
         local $TODO = $search_broken if $search_broken;
-        lives_ok { $sql = $search->sql } "$name: generate SQL";
+        lives_ok { $sql = $search->_sql } "$name: generate SQL";
     }
     
     my $results;
     SKIP: {
         skip "Can't run SQL without any SQL", 1 if !defined $sql;
-        $results = $self->_test_sql($sql);
+        $results = $self->_test_sql($search);
     }
 
     $self->_test_content($results, $sql);
@@ -553,12 +553,11 @@ sub _test_search_object_creation {
 }
 
 sub _test_sql {
-    my ($self, $sql) = @_;
-    my $dbh = Bugzilla->dbh;
+    my ($self, $search) = @_;
     my $name = $self->name;
     my $results;
-    lives_ok { $results = $dbh->selectall_arrayref($sql) } "$name: Run SQL Query"
-        or diag($sql);
+    lives_ok { $results = $search->data } "$name: Run SQL Query"
+        or diag($search->_sql);
     return $results;
 }
 

From c81ae6e34d17ff40b658b6356f95634ae8cff582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 17 Jan 2013 13:13:36 +0100
Subject: [PATCH 031/240] Bug 830467: Don't call _wanted_languages() when only
 one is available r=glob a=LpSolit

---
 Bugzilla.pm              | 10 +++++++++-
 Bugzilla/Install/Util.pm |  6 ++++--
 Bugzilla/Template.pm     | 11 +++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 985834876..0681b83c7 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -28,7 +28,7 @@ use Bugzilla::Extension;
 use Bugzilla::DB;
 use Bugzilla::Install::Localconfig qw(read_localconfig);
 use Bugzilla::Install::Requirements qw(OPTIONAL_MODULES);
-use Bugzilla::Install::Util qw(init_console);
+use Bugzilla::Install::Util qw(init_console include_languages);
 use Bugzilla::Template;
 use Bugzilla::User;
 use Bugzilla::Error;
@@ -420,6 +420,10 @@ sub languages {
     return Bugzilla::Install::Util::supported_languages();
 }
 
+sub current_language {
+    return $_[0]->request_cache->{current_language} ||= (include_languages())[0];
+}
+
 sub error_mode {
     my ($class, $newval) = @_;
     if (defined $newval) {
@@ -912,6 +916,10 @@ The main database handle. See L<DBI>.
 Currently installed languages.
 Returns a reference to a list of RFC 1766 language tags of installed languages.
 
+=item C<current_language>
+
+The currently active language.
+
 =item C<switch_to_shadow_db>
 
 Switch from using the main database to using the shadow database.
diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 7a7611bd1..53cc9d2ec 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -371,7 +371,10 @@ sub include_languages {
 
     # Basically, the way this works is that we have a list of languages
     # that we *want*, and a list of languages that Bugzilla actually
-    # supports.
+    # supports. If there is only one language installed, we take it.
+    my $supported = supported_languages();
+    return @$supported if @$supported == 1;
+
     my $wanted;
     if ($params->{language}) {
         # We can pass several languages at once as an arrayref
@@ -382,7 +385,6 @@ sub include_languages {
     else {
         $wanted = _wanted_languages();
     }
-    my $supported = supported_languages();
     my $actual    = _wanted_to_actual_languages($wanted, $supported);
     return @$actual;
 }
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index b93e1bfae..81d01b426 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -881,14 +881,9 @@ sub create {
             # Currently logged in user, if any
             # If an sudo session is in progress, this is the user we're faking
             'user' => sub { return Bugzilla->user; },
-           
+
             # Currenly active language
-            # XXX Eventually this should probably be replaced with something
-            # like Bugzilla->language.
-            'current_language' => sub {
-                my ($language) = include_languages();
-                return $language;
-            },
+            'current_language' => sub { return Bugzilla->current_language; },
 
             # If an sudo session is in progress, this is the user who
             # started the session.
@@ -899,7 +894,7 @@ sub create {
 
             # Allow templates to access docs url with users' preferred language
             'docs_urlbase' => sub { 
-                my ($language) = include_languages();
+                my $language = Bugzilla->current_language;
                 my $docs_urlbase = Bugzilla->params->{'docs_urlbase'};
                 $docs_urlbase =~ s/\%lang\%/$language/;
                 return $docs_urlbase;

From d2a32130443450ccde2be1ee20d56b96a92a7a13 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Thu, 17 Jan 2013 10:54:33 -0500
Subject: [PATCH 032/240] Bug 752946 - Moving a bug into another product lists
 inactive components, milestones and versions r/a=LpSolit

---
 Bugzilla/Bug.pm                               | 28 ++++++++++++++-----
 .../en/default/global/user-error.html.tmpl    |  5 ++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 4485b620c..c67093d6b 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1465,8 +1465,13 @@ sub _check_component {
     $name || ThrowUserError("require_component");
     my $product = blessed($invocant) ? $invocant->product_obj 
                                      : $params->{product};
-    my $obj = Bugzilla::Component->check({ product => $product, name => $name });
-    return $obj;
+    my $old_comp = blessed($invocant) ? $invocant->component
+                                      : $params->{component};
+    my $object = Bugzilla::Component->check({ product => $product, name => $name });
+    if ($object->name ne $old_comp && !$object->is_active) {
+        ThrowUserError('value_inactive', { class => ref($object), value => $name });
+    }
+    return $object;
 }
 
 sub _check_creation_ts {
@@ -1924,10 +1929,15 @@ sub _check_target_milestone {
     my ($invocant, $target, undef, $params) = @_;
     my $product = blessed($invocant) ? $invocant->product_obj 
                                      : $params->{product};
+    my $old_target = blessed($invocant) ? $invocant->target_milestone
+                                        : $params->{target_milestone};
     $target = trim($target);
     $target = $product->default_milestone if !defined $target;
     my $object = Bugzilla::Milestone->check(
         { product => $product, name => $target });
+    if ($object->name ne $old_target && !$object->is_active) {
+        ThrowUserError('value_inactive', { class => ref($object),  value => $target });
+    }
     return $object->name;
 }
 
@@ -1950,8 +1960,12 @@ sub _check_version {
     $version = trim($version);
     my $product = blessed($invocant) ? $invocant->product_obj 
                                      : $params->{product};
-    my $object = 
-        Bugzilla::Version->check({ product => $product, name => $version });
+    my $old_vers = blessed($invocant) ? $invocant->version
+                                      : $params->{version};
+    my $object = Bugzilla::Version->check({ product => $product, name => $version });
+    if ($object->name ne $old_vers && !$object->is_active) {
+        ThrowUserError('value_inactive', { class => ref($object), value => $version });
+    }
     return $object->name;
 }
 
@@ -2510,9 +2524,9 @@ sub _set_product {
                 milestone => $milestone_ok ? $self->target_milestone
                                            : $product->default_milestone
             };
-            $vars{components} = [map { $_->name } @{$product->components}];
-            $vars{milestones} = [map { $_->name } @{$product->milestones}];
-            $vars{versions}   = [map { $_->name } @{$product->versions}];
+            $vars{components} = [map { $_->name } grep($_->is_active, @{$product->components})];
+            $vars{milestones} = [map { $_->name } grep($_->is_active, @{$product->milestones})];
+            $vars{versions}   = [map { $_->name } grep($_->is_active, @{$product->versions})];
         }
 
         if (!$verified) {
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 03c26c5aa..c9448a503 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1722,6 +1722,11 @@
     [% title = "Unknown Tab" %]
     There is no tab named <code>[% current_tab_name FILTER html %]</code>.
 
+  [% ELSIF error == "value_inactive" %]
+    [% title = "Value is Not Active" %]
+    [% type = BLOCK %][% INCLUDE object_name class = class %][% END %]
+    The [% type FILTER html %] value '[% value FILTER html %]' is not active.
+
   [% ELSIF error == "version_already_exists" %]
     [% title = "Version Already Exists" %]
     [% admindocslinks = {'versions.html' => 'Administering versions'} %]

From d7a89e8148c89c20a0ee311b8cbf32e19e840e2c Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Thu, 17 Jan 2013 12:45:43 -0500
Subject: [PATCH 033/240] Bug 752946 - Fixed uninitialized error

---
 Bugzilla/Bug.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index c67093d6b..547e35fa7 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1935,7 +1935,7 @@ sub _check_target_milestone {
     $target = $product->default_milestone if !defined $target;
     my $object = Bugzilla::Milestone->check(
         { product => $product, name => $target });
-    if ($object->name ne $old_target && !$object->is_active) {
+    if ($old_target && $object->name ne $old_target && !$object->is_active) {
         ThrowUserError('value_inactive', { class => ref($object),  value => $target });
     }
     return $object->name;

From 7b9f7c5e5a1e1ec577933bb21ad18bfdecba7853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 17 Jan 2013 23:10:43 +0100
Subject: [PATCH 034/240] Bug 820766: The requester and requestee fields in the
 Requests page are way too small in narrow windows r=dkl a=LpSolit

---
 skins/standard/buglist.css                  | 15 +++++++++++++++
 template/en/default/request/queue.html.tmpl |  4 ----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/skins/standard/buglist.css b/skins/standard/buglist.css
index b4920c609..6d23fc8bb 100644
--- a/skins/standard/buglist.css
+++ b/skins/standard/buglist.css
@@ -114,3 +114,18 @@ td.bz_total {
 .bz_short_desc_column a, .bz_short_short_desc_column a {
     color: inherit;
 }
+
+/* The "filtering" table is specific to request.cgi.
+ * Same for the "requests" class used for tables. */
+
+#filtering #requester, #filtering #requestee {
+    min-width: 8em;
+}
+
+#filtering th {
+    text-align: right;
+}
+
+table.requests th {
+    text-align: left;
+}
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 676e89264..68a519725 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -11,10 +11,6 @@
 
 [% PROCESS global/header.html.tmpl
   title="Request Queue"
-  style = "
-    table.requests th { text-align: left; }
-    table#filtering th { text-align: right; }
-  "
   onload="var f = document.request_form; selectProduct(f.product, f.component, null, null, 'Any');"
   javascript_urls=["js/productform.js", "js/field.js"]
   style_urls = ['skins/standard/buglist.css']

From 9d56081d09fa9744dca88a632af95851b37c40e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 22 Jan 2013 23:43:30 +0100
Subject: [PATCH 035/240] Bug 819371: Weird list of arguments passed to
 query.cgi when accessing advanced search r=glob a=LpSolit

---
 template/en/default/search/boolean-charts.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index df369eb29..508e11c65 100644
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -61,7 +61,6 @@
     TUI_hide_default('custom_search_advanced');
   </script>
   <script type="text/javascript" src="[% 'js/custom-search.js' FILTER mtime %]"></script>
-  <script type="text/javascript" src="[% 'js/history.js/native.history.js' FILTER mtime %]"></script>
   <script type="text/javascript">
     redirect_html4_browsers();
     [%# These are alternative labels for the AND and OR options in and_all_select %]
@@ -69,6 +68,7 @@
     var cs_or_label  = 'Match ANY of the following:';
     cs_reconfigure('custom_search_last_row');
   </script>
+  <script type="text/javascript" src="[% 'js/history.js/native.history.js' FILTER mtime %]"></script>
 </div>
 
 

From f2e86a6b91ce0b9b1f029550121769b2fc2e71e1 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Wed, 30 Jan 2013 17:21:16 +0100
Subject: [PATCH 036/240] Bug 272407: Send an e-mail when the administrator
 creates a new account for a user r/a=LpSolit

---
 editusers.cgi                                 | 10 ++++++
 .../en/default/admin/users/userdata.html.tmpl |  9 ++++++
 .../default/email/new-user-details.txt.tmpl   | 31 +++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 template/en/default/email/new-user-details.txt.tmpl

diff --git a/editusers.cgi b/editusers.cgi
index 66871e413..e12fc35b6 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -21,6 +21,7 @@ use Bugzilla::Flag;
 use Bugzilla::Field;
 use Bugzilla::Group;
 use Bugzilla::Token;
+use Bugzilla::Mailer;
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
@@ -218,6 +219,15 @@ if ($action eq 'search') {
 
     delete_token($token);
 
+    if ($cgi->param('notify_user')) {
+        $vars->{'new_user'} = $new_user;
+        my $message;
+      
+        $template->process('email/new-user-details.txt.tmpl', $vars, \$message)
+            || ThrowTemplateError($template->error());
+        MessageToMTA($message);
+    }
+
     # We already display the updated page. We have to recreate a token now.
     $vars->{'token'} = issue_session_token('edit_user');
     $vars->{'message'} = 'account_created';
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index ae952d151..e42ee6438 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -107,3 +107,12 @@
     </td>
   </tr>
 [% END %]
+[% UNLESS editform %]
+  <tr>
+    <th><label for="notify_user">Notify User:</label></th>
+    <td>
+      <input type="checkbox" name="notify_user" id="notify_user" value="1">
+      (Email this user their account information. The password will not be included.)
+    </td>
+  </tr>
+[% END %]
diff --git a/template/en/default/email/new-user-details.txt.tmpl b/template/en/default/email/new-user-details.txt.tmpl
new file mode 100644
index 000000000..b1b43caf2
--- /dev/null
+++ b/template/en/default/email/new-user-details.txt.tmpl
@@ -0,0 +1,31 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# INTERFACE:
+  # new_user: The Bugzilla::User object of the user being created
+  #%]
+
+From: [% Param('mailfrom') %]
+To: [% new_user.email %]
+Subject: [% terms.Bugzilla %]: New account created
+X-Bugzilla-Type: admin
+
+[This e-mail has been automatically generated]
+
+A new [% terms.Bugzilla %] user account has been created at [% urlbase %]:
+
+Login: [% new_user.login %]
+[% IF new_user.realname %]
+Real name: [% new_user.realname %]
+[% END %]
+
+For security reasons, we have not included your new password in this e-mail.
+If you have not being given it via other means, you can use the 'Forgot
+Password' link to set a new password.
+
+If you have any issues regarding your account, please contact [% Param('maintainer') %].

From 3b0bc98fb933d5bb4e0aed56b5e6d7552bcfdbf9 Mon Sep 17 00:00:00 2001
From: Olav Vitters <bugzilla-mozilla@vitters.nl>
Date: Wed, 30 Jan 2013 17:26:00 +0100
Subject: [PATCH 037/240] Bug 824636: Only show "Show dependency tree / graph"
 when there are bugs in the dependency chain r/a=LpSolit

---
 template/en/default/bug/edit.html.tmpl | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 6f33b7484..3ca5ab4a5 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -590,18 +590,20 @@
     [% INCLUDE dependencies 
          field = bug_fields.blocked deps = bug.blocks_obj %]
   </tr>
-  
-  <tr>
-    <th>&nbsp;</th>
-  
-    <td colspan="2" align="left" id="show_dependency_tree_or_graph">
-      Show dependency <a href="showdependencytree.cgi?id=[% bug.bug_id %]&amp;hide_resolved=1">tree</a>
-  
-      [% IF Param('webdotbase') %]
-        /&nbsp;<a href="showdependencygraph.cgi?id=[% bug.bug_id %]">graph</a>
-      [% END %]
-    </td>
-  </tr>
+
+  [% IF bug.dependson.size || bug.blocked.size %]
+    <tr>
+      <th>&nbsp;</th>
+
+      <td colspan="2" align="left" id="show_dependency_tree_or_graph">
+        Show dependency <a href="showdependencytree.cgi?id=[% bug.bug_id %]&amp;hide_resolved=1">tree</a>
+
+        [% IF Param('webdotbase') %]
+          /&nbsp;<a href="showdependencygraph.cgi?id=[% bug.bug_id %]">graph</a>
+        [% END %]
+      </td>
+    </tr>
+  [% END %]
 [% END %]
 
 

From 68a0f9dbb110800f1890125c99140c302c56228f Mon Sep 17 00:00:00 2001
From: Daniel Piddock <dgp-bz@corefiling.co.uk>
Date: Wed, 30 Jan 2013 17:29:06 +0100
Subject: [PATCH 038/240] Bug 835780: Order quips chronologically when listing
 them r/a=LpSolit

---
 quips.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quips.cgi b/quips.cgi
index bbe53c86e..6ded45091 100755
--- a/quips.cgi
+++ b/quips.cgi
@@ -30,7 +30,7 @@ my $token = $cgi->param('token');
 if ($action eq "show") {
     # Read in the entire quip list
     my $quipsref = $dbh->selectall_arrayref(
-                       "SELECT quipid, userid, quip, approved FROM quips");
+                       "SELECT quipid, userid, quip, approved FROM quips ORDER BY quipid");
 
     my $quips;
     my @quipids;

From 2682b5cff3286fc8482dce8fad81d689b5be70ec Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Wed, 30 Jan 2013 12:48:15 -0500
Subject: [PATCH 039/240] Bug 833752 - Bug id custom fields should be clickable
 in bug list r=dkl, a=LpSolit

---
 template/en/default/list/table.html.tmpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 02fe8e728..b686e7924 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -200,6 +200,10 @@
         <a href="show_bug.cgi?id=[% bug.bug_id FILTER html %]">
           [%- bug.$column.truncate(col_abbrev.maxlength, col_abbrev.ellipsis) FILTER html -%]
         </a>
+      [% ELSIF bug_fields.$column.type == constants.FIELD_TYPE_BUG_ID %]
+        <a href="show_bug.cgi?id=[% bug.$column FILTER html %]">
+          [%- bug.$column.truncate(col_abbrev.maxlength, col_abbrev.ellipsis) FILTER html -%]
+        </a>
       [% ELSE %]
         [%- display_value(column, bug.$column).truncate(col_abbrev.maxlength, col_abbrev.ellipsis) FILTER html -%]
       [% END %]

From a205b1fd840a9826bd4147141025542be342b85c Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Wed, 30 Jan 2013 19:05:50 +0100
Subject: [PATCH 040/240] Bug 102048: Display the "Blocks" and "Depends On"
 columns in buglists r/a=LpSolit

---
 Bugzilla/Field.pm                        |  4 ++--
 Bugzilla/Search.pm                       | 13 +++++++++++++
 template/en/default/list/table.html.tmpl |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index c85d43bb8..c4ee77498 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -200,9 +200,9 @@ use constant DEFAULT_FIELDS => (
      buglist => 1},
     {name => 'cc',           desc => 'CC',         in_new_bugmail => 1},
     {name => 'dependson',    desc => 'Depends on', in_new_bugmail => 1,
-     is_numeric => 1},
+     is_numeric => 1, buglist => 1},
     {name => 'blocked',      desc => 'Blocks',     in_new_bugmail => 1,
-     is_numeric => 1},
+     is_numeric => 1, buglist => 1},
 
     {name => 'attachments.description', desc => 'Attachment description'},
     {name => 'attachments.filename',    desc => 'Attachment filename'},
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 1c6af782e..658b85f99 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -468,6 +468,14 @@ sub COLUMN_JOINS {
                 to    => 'id',
             },
         },
+        blocked => {
+            table => 'dependencies',
+            to => 'dependson',
+        },
+        dependson => {
+            table => 'dependencies',
+            to => 'blocked',
+        },
         'longdescs.count' => {
             table => 'longdescs',
             join  => 'INNER',
@@ -548,6 +556,9 @@ sub COLUMNS {
             . $dbh->sql_string_concat('map_flagtypes.name', 'map_flags.status')),
 
         'keywords' => $dbh->sql_group_concat('DISTINCT map_keyworddefs.name'),
+
+        blocked => $dbh->sql_group_concat('DISTINCT map_blocked.blocked'),
+        dependson => $dbh->sql_group_concat('DISTINCT map_dependson.dependson'),
         
         'longdescs.count' => 'COUNT(DISTINCT map_longdescs_count.comment_id)',
 
@@ -645,7 +656,9 @@ sub REPORT_COLUMNS {
 # is here because it *always* goes into the GROUP BY as the first item,
 # so it should be skipped when determining extra GROUP BY columns.
 use constant GROUP_BY_SKIP => qw(
+    blocked
     bug_id
+    dependson
     flagtypes.name
     keywords
     longdescs.count
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index b686e7924..e68542515 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -46,6 +46,8 @@
     "short_short_desc"  => { maxlength => 60 , ellipsis => "..." , wrap => 1 } ,
     "status_whiteboard" => { maxlength => 0, title => "Whiteboard" , wrap => 1 } , 
     "keywords"          => { maxlength => 0, wrap => 1 } ,
+    "dependson"         => { maxlength => 0, wrap => 1 } ,
+    "blocked"           => { maxlength => 0, wrap => 1 } ,
     "flagtypes.name"    => { maxlength => 0, wrap => 1 } ,
     "component"         => { maxlength => 8 , title => "Comp" } , 
     "product"           => { maxlength => 8 } , 

From 7188f69dbc3075834a40294772de95cf3acd2012 Mon Sep 17 00:00:00 2001
From: Koosha Khajeh Moogahi <koosha.khajeh@gmail.com>
Date: Sun, 3 Feb 2013 23:46:29 +0100
Subject: [PATCH 041/240] Bug 821410: Add support for bitbucket.org for the
 'See Also' field r/a=LpSolit

---
 extensions/MoreBugUrl/Extension.pm            |  1 +
 extensions/MoreBugUrl/lib/BitBucket.pm        | 39 +++++++++++++++++++
 ...er-error-bug_url_invalid_tracker.html.tmpl |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 extensions/MoreBugUrl/lib/BitBucket.pm

diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm
index 5c71fa598..f2ca7150c 100644
--- a/extensions/MoreBugUrl/Extension.pm
+++ b/extensions/MoreBugUrl/Extension.pm
@@ -12,6 +12,7 @@ use strict;
 use parent qw(Bugzilla::Extension);
 
 use constant MORE_SUB_CLASSES => qw(
+    Bugzilla::Extension::MoreBugUrl::BitBucket
     Bugzilla::Extension::MoreBugUrl::ReviewBoard
     Bugzilla::Extension::MoreBugUrl::Rietveld
     Bugzilla::Extension::MoreBugUrl::RT
diff --git a/extensions/MoreBugUrl/lib/BitBucket.pm b/extensions/MoreBugUrl/lib/BitBucket.pm
new file mode 100644
index 000000000..fbb7be1a1
--- /dev/null
+++ b/extensions/MoreBugUrl/lib/BitBucket.pm
@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::Extension::MoreBugUrl::BitBucket;
+
+use 5.10.1;
+use strict;
+use parent qw(Bugzilla::BugUrl);
+
+###############################
+####        Methods        ####
+###############################
+
+sub should_handle {
+    my ($class, $uri) = @_;
+
+    # BitBucket issues have the form of
+    # bitbucket.org/user/project/issue/1234
+    return (lc($uri->authority) eq "bitbucket.org"
+            && $uri->path =~ m|[^/]+/[^/]+/issue/\d+|i) ? 1 : 0;
+}
+
+sub _check_value {
+    my $class = shift;
+
+    my $uri = $class->SUPER::_check_value(@_);
+
+    my ($path) = $uri->path =~ m|([^/]+/[^/]+/issue/\d+)|i;
+    $uri = new URI("https://bitbucket.org/$path");
+
+    return $uri;
+}
+
+1;
+
diff --git a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
index 7683e4299..0c62f6e5f 100644
--- a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
+++ b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
@@ -6,6 +6,7 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
+<li>An issue on bitbucket.org.</li>
 <li>A Review Board review request.</li>
 <li>An issue in a Rietveld installation.</li>
 <li>A ticket in an RT installation.</li>

From 51de9a1c9ac51f12ad4e66e5246ab977d8f6df17 Mon Sep 17 00:00:00 2001
From: Koosha Khajeh Moogahi <koosha.khajeh@gmail.com>
Date: Sun, 3 Feb 2013 23:50:04 +0100
Subject: [PATCH 042/240] Bug 834770: testserver.pl should support uppercase
 URLs r/a=LpSolit

---
 testserver.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testserver.pl b/testserver.pl
index fc3b5b0ab..f00f551f9 100755
--- a/testserver.pl
+++ b/testserver.pl
@@ -25,7 +25,7 @@ my $datadir = bz_locations()->{'datadir'};
 eval "require LWP; require LWP::UserAgent;";
 my $lwp = $@ ? 0 : 1;
 
-if ((@ARGV != 1) || ($ARGV[0] !~ /^https?:/))
+if ((@ARGV != 1) || ($ARGV[0] !~ /^https?:/i))
 {
     say "Usage: $0 <URL to this Bugzilla installation>";
     say "e.g.:  $0 http://www.mycompany.com/bugzilla";

From 95ffd0d65ff9d6291b8ed6b9472564131f43679e Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 7 Feb 2013 15:03:00 +0800
Subject: [PATCH 043/240] Bug 784352: Show a warning when interdiff reports
 errors r=dkl, a=LpSolit

---
 Bugzilla/Attachment/PatchReader.pm            | 28 +++++++++++++++----
 .../default/attachment/diff-header.html.tmpl  | 19 +++++++------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/Bugzilla/Attachment/PatchReader.pm b/Bugzilla/Attachment/PatchReader.pm
index cf1648579..29ff1f93f 100644
--- a/Bugzilla/Attachment/PatchReader.pm
+++ b/Bugzilla/Attachment/PatchReader.pm
@@ -10,6 +10,9 @@ package Bugzilla::Attachment::PatchReader;
 use 5.10.1;
 use strict;
 
+use IPC::Open3;
+use Symbol 'gensym';
+
 use Bugzilla::Error;
 use Bugzilla::Attachment;
 use Bugzilla::Util;
@@ -100,8 +103,23 @@ sub process_interdiff {
     # Send through interdiff, send output directly to template.
     # Must hack path so that interdiff will work.
     $ENV{'PATH'} = $lc->{diffpath};
-    open my $interdiff_fh, "$lc->{interdiffbin} $old_filename $new_filename|";
-    binmode $interdiff_fh;
+
+    my ($interdiff_stdout, $interdiff_stderr);
+    $interdiff_stderr = gensym;
+    my $pid = open3(gensym, $interdiff_stdout, $interdiff_stderr,
+                    $lc->{interdiffbin}, $old_filename, $new_filename);
+    binmode $interdiff_stdout;
+
+    # Check for errors
+    {
+        local $/ = undef;
+        my $error = <$interdiff_stderr>;
+        if ($error) {
+            warn($error);
+            $warning = 'interdiff3';
+        }
+    }
+
     my ($reader, $last_reader) = setup_patch_readers("", $context);
 
     if ($format eq 'raw') {
@@ -114,7 +132,7 @@ sub process_interdiff {
     }
     else {
         # In case the HTML page is displayed with the UTF-8 encoding.
-        binmode $interdiff_fh, ':utf8' if Bugzilla->params->{'utf8'};
+        binmode $interdiff_stdout, ':utf8' if Bugzilla->params->{'utf8'};
 
         $vars->{'warning'} = $warning if $warning;
         $vars->{'bugid'} = $new_attachment->bug_id;
@@ -125,9 +143,9 @@ sub process_interdiff {
 
         setup_template_patch_reader($last_reader, $format, $context, $vars);
     }
-    $reader->iterate_fh($interdiff_fh, 'interdiff #' . $old_attachment->id .
+    $reader->iterate_fh($interdiff_stdout, 'interdiff #' . $old_attachment->id .
                         ' #' . $new_attachment->id);
-    close $interdiff_fh;
+    waitpid($pid, 0);
     $ENV{'PATH'} = '';
 
     # Delete temporary files.
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index ed4d44e25..4261c8423 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -119,15 +119,18 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
 [% END %]
 
 [% IF warning %]
-<h2 class="warning">Warning: 
+<h2 class="warning">
+  Warning:
   [% IF warning == "interdiff1" %]
-  this difference between two patches may show things in the wrong places due
-  to a limitation in [% terms.Bugzilla %] when comparing patches with different
-  sets of files.
-  [% END %]
-  [% IF warning == "interdiff2" %]
-  this difference between two patches may be inaccurate due to a limitation in
-  [%+ terms.Bugzilla %] when comparing patches made against different revisions.
+    this difference between two patches may show things in the wrong places due
+    to a limitation in [% terms.Bugzilla %] when comparing patches with
+    different sets of files.
+  [% ELSIF warning == "interdiff2" %]
+    this difference between two patches may be inaccurate due to a limitation
+    in [%+ terms.Bugzilla %] when comparing patches made against different
+    revisions.
+  [% ELSIF warning == "interdiff3" %]
+    interdiff encountered errors while comparing these patches.
   [% END %]
 </h2>
 [% ELSE %]

From 5ca803ff3b2dc51cc7f9964c84d1f2ec7945ed21 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 15 Feb 2013 13:18:14 +0800
Subject: [PATCH 044/240] Bug 839095: Fix interdiff failing on mod_perl with
 "No valid patch files were found in the attachment" r=dkl, a=LpSolit

---
 Bugzilla/Attachment/PatchReader.pm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Bugzilla/Attachment/PatchReader.pm b/Bugzilla/Attachment/PatchReader.pm
index 29ff1f93f..7bbbfacae 100644
--- a/Bugzilla/Attachment/PatchReader.pm
+++ b/Bugzilla/Attachment/PatchReader.pm
@@ -104,10 +104,19 @@ sub process_interdiff {
     # Must hack path so that interdiff will work.
     $ENV{'PATH'} = $lc->{diffpath};
 
-    my ($interdiff_stdout, $interdiff_stderr);
-    $interdiff_stderr = gensym;
-    my $pid = open3(gensym, $interdiff_stdout, $interdiff_stderr,
-                    $lc->{interdiffbin}, $old_filename, $new_filename);
+    my ($pid, $interdiff_stdout, $interdiff_stderr);
+    if ($ENV{MOD_PERL}) {
+        require Apache2::RequestUtil;
+        require Apache2::SubProcess;
+        my $request = Apache2::RequestUtil->request;
+        (undef, $interdiff_stdout, $interdiff_stderr) = $request->spawn_proc_prog(
+            $lc->{interdiffbin}, [$old_filename, $new_filename]
+        );
+    } else {
+        $interdiff_stderr = gensym;
+        my $pid = open3(gensym, $interdiff_stdout, $interdiff_stderr,
+                        $lc->{interdiffbin}, $old_filename, $new_filename);
+    }
     binmode $interdiff_stdout;
 
     # Check for errors
@@ -145,7 +154,7 @@ sub process_interdiff {
     }
     $reader->iterate_fh($interdiff_stdout, 'interdiff #' . $old_attachment->id .
                         ' #' . $new_attachment->id);
-    waitpid($pid, 0);
+    waitpid($pid, 0) if $pid;
     $ENV{'PATH'} = '';
 
     # Delete temporary files.

From ef3caa58b2eaa5ee36c142fe07d6c3bb8bcaf216 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 15 Feb 2013 13:57:04 +0800
Subject: [PATCH 045/240] Bug 832893: changes jobqueue.pl to spawn worker
 processes to deliver bugmail to avoid memory leaks r=dkl, a=LpSolit

---
 Bugzilla/JobQueue.pm        | 60 ++++++++++++++++++++++++++++++++++++-
 Bugzilla/JobQueue/Runner.pm | 28 ++++++++++-------
 jobqueue.pl                 |  1 +
 t/011pod.t                  |  2 +-
 4 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/Bugzilla/JobQueue.pm b/Bugzilla/JobQueue.pm
index 098ee7935..9365a7d56 100644
--- a/Bugzilla/JobQueue.pm
+++ b/Bugzilla/JobQueue.pm
@@ -13,7 +13,10 @@ use strict;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Install::Util qw(install_string);
-use parent qw(TheSchwartz);
+use File::Basename;
+use File::Slurp;
+use base qw(TheSchwartz);
+use fields qw(_worker_pidfile);
 
 # This maps job names for Bugzilla::JobQueue to the appropriate modules.
 # If you add new types of jobs, you should add a mapping here.
@@ -93,6 +96,57 @@ sub insert {
     return $retval;
 }
 
+# To avoid memory leaks/fragmentation which tends to happen for long running
+# perl processes; check for jobs, and spawn a new process to empty the queue.
+sub subprocess_worker {
+    my $self = shift;
+
+    my $command = "$0 -d -p '" . $self->{_worker_pidfile} . "' onepass";
+
+    while (1) {
+        my $time = (time);
+        my @jobs = $self->list_jobs({
+            funcname      => $self->{all_abilities},
+            run_after     => $time,
+            grabbed_until => $time,
+            limit         => 1,
+        });
+        if (@jobs) {
+            $self->debug("Spawning queue worker process");
+            # Run the worker as a daemon
+            system $command;
+            # And poll the PID to detect when the working has finished.
+            # We do this instead of system() to allow for the INT signal to
+            # interrup us and trigger kill_worker().
+            my $pid = read_file($self->{_worker_pidfile}, err_mode => 'quiet');
+            if ($pid) {
+                sleep(3) while(kill(0, $pid));
+            }
+            $self->debug("Queue worker process completed");
+        } else {
+            $self->debug("No jobs found");
+        }
+        sleep(5);
+    }
+}
+
+sub kill_worker {
+    my $self = Bugzilla->job_queue();
+    if ($self->{_worker_pidfile} && -e $self->{_worker_pidfile}) {
+        my $worker_pid = read_file($self->{_worker_pidfile});
+        if ($worker_pid && kill(0, $worker_pid)) {
+            $self->debug("Stopping worker process");
+            system "$0 -f -p '" . $self->{_worker_pidfile} . "' stop";
+        }
+    }
+}
+
+sub set_pidfile {
+    my ($self, $pidfile) = @_;
+    $self->{_worker_pidfile} = bz_locations->{'datadir'} .
+                               '/worker-' . basename($pidfile);
+}
+
 # Clear the request cache at the start of each run.
 sub work_once {
     my $self = shift;
@@ -136,4 +190,8 @@ be sent away to be done later.
 
 =item job_map
 
+=item set_pidfile
+
+=item kill_worker
+
 =back
diff --git a/Bugzilla/JobQueue/Runner.pm b/Bugzilla/JobQueue/Runner.pm
index 7ab4f7f1a..a0d6a77cb 100644
--- a/Bugzilla/JobQueue/Runner.pm
+++ b/Bugzilla/JobQueue/Runner.pm
@@ -38,6 +38,7 @@ our $initscript = "bugzilla-queue";
 sub gd_preconfig {
     my $self = shift;
 
+    $self->{_run_command} = 'subprocess_worker';
     my $pidfile = $self->{gd_args}{pidfile};
     if (!$pidfile) {
         $pidfile = bz_locations()->{datadir} . '/' . $self->{gd_progname} 
@@ -136,6 +137,7 @@ sub gd_can_install {
             print $config_fh <<END;
 #!/bin/sh
 BUGZILLA="$directory"
+# This user must have write access to Bugzilla's data/ directory.
 USER=$owner
 END
             close($config_fh);
@@ -183,21 +185,25 @@ sub gd_setup_signals {
     $SIG{TERM} = sub { $self->gd_quit_event(); }
 }
 
-sub gd_other_cmd {
-    my ($self) = shift;
-    if ($ARGV[0] eq "once") {
-        $self->_do_work("work_once");
+sub gd_quit_event {
+    Bugzilla->job_queue->kill_worker();
+    exit(1);
+}
 
-        exit(0);
+sub gd_other_cmd {
+    my ($self, $do, $locked) = @_;
+    if ($do eq "once") {
+        $self->{_run_command} = 'work_once';
+    } elsif ($do eq "onepass") {
+        $self->{_run_command} = 'work_until_done';
+    } else {
+        $self->SUPER::gd_other_cmd($do, $locked);
     }
-    
-    $self->SUPER::gd_other_cmd();
 }
 
 sub gd_run {
     my $self = shift;
-
-    $self->_do_work("work");
+    $self->_do_work($self->{_run_command});
 }
 
 sub _do_work {
@@ -205,11 +211,11 @@ sub _do_work {
 
     my $jq = Bugzilla->job_queue();
     $jq->set_verbose($self->{debug});
+    $jq->set_pidfile($self->{gd_pidfile});
     foreach my $module (values %{ Bugzilla::JobQueue->job_map() }) {
         eval "use $module";
         $jq->can_do($module);
     }
-
     $jq->$fn;
 }
 
@@ -242,6 +248,8 @@ to run the Bugzilla job queue.
 
 =item gd_can_install
 
+=item gd_quit_event
+
 =item gd_other_cmd
 
 =item gd_more_opt
diff --git a/jobqueue.pl b/jobqueue.pl
index 6ba288d2e..c8afd74cc 100755
--- a/jobqueue.pl
+++ b/jobqueue.pl
@@ -46,6 +46,7 @@ jobqueue.pl - Runs jobs in the background for Bugzilla.
              starts a new one.
    once      Checks the job queue once, executes the first item found (if
              any) and then exits
+   onepass   Checks the job queue, executes all items found, and then exits
    check     Report the current status of the daemon.
    install   On some *nix systems, this automatically installs and
              configures jobqueue.pl as a system service so that it will
diff --git a/t/011pod.t b/t/011pod.t
index 7fdafd910..92474d553 100644
--- a/t/011pod.t
+++ b/t/011pod.t
@@ -30,7 +30,7 @@ use constant DEFAULT_WHITELIST => qr/^(?:new|new_from_list|check|run_create_vali
 use constant SUB_WHITELIST => (
     'Bugzilla::Flag'     => qr/^(?:(force_)?retarget|force_cleanup)$/,
     'Bugzilla::FlagType' => qr/^sqlify_criteria$/,
-    'Bugzilla::JobQueue' => qr/^work_once$/,
+    'Bugzilla::JobQueue' => qr/(?:^work_once|subprocess_worker)$/,
 );
 
 # These modules do not need to be documented, generally because they

From ccf486848cfd5ab1eff90a8b1a87cbb60e54123f Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Fri, 15 Feb 2013 14:04:00 +0800
Subject: [PATCH 046/240] Bug 830333: Make the comment box hidden if
 bug_check_can_change_field reports the user is unable to comment on the bug
 r=glob, a=LpSolit

---
 template/en/default/bug/comments.html.tmpl | 14 ++++++++------
 template/en/default/bug/edit.html.tmpl     | 22 +++++++++++++---------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 62beb61ea..d2de3521c 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -141,18 +141,20 @@
 
         [% IF mode == "edit" %]
           <span class="bz_comment_actions">
-            [<a class="bz_reply_link" href="#add_comment"
-              [% IF user.settings.quote_replies.value != 'off' %]
-                onclick="replyToComment('[% count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]'); return false;"
-              [% END %]
-            >reply</a>]
+            [% IF bug.check_can_change_field('longdesc', 0, 1) %]
+              [<a class="bz_reply_link" href="#add_comment"
+                [% IF user.settings.quote_replies.value != 'off' %]
+                  onclick="replyToComment('[% count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]'); return false;"
+                [% END %]
+              >reply</a>]
+            [% END %]
             <script type="text/javascript"><!--
               addCollapseLink([% count %], 'Toggle comment display'); // -->
             </script>
           </span>
         [% END %]
 
-        [% IF mode == "edit" && user.is_insider %]
+        [% IF mode == "edit" && user.is_insider && bug.check_can_change_field('longdesc', 0, 1) %]
           <div class="bz_private_checkbox">
             <input type="hidden" value="1"
                    name="defined_isprivate_[% comment.id %]">
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 3ca5ab4a5..c48b17c08 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -1052,7 +1052,7 @@
       <label for="comment" accesskey="c"><b>Additional 
         <u>C</u>omments</b></label>:
 
-      [% IF user.is_insider %]
+      [% IF user.is_insider && bug.check_can_change_field('longdesc', 0, 1) %]
         <input type="checkbox" name="comment_is_private" value="1"
                id="newcommentprivacy"
                onClick="updateCommentTagControl(this, 'comment')">
@@ -1064,14 +1064,18 @@
 
       <!-- This table keeps the submit button aligned with the box. -->
       <table><tr><td>
-        [% INCLUDE global/textarea.html.tmpl
-                   name      = 'comment'
-                   id        = 'comment'
-                   minrows   = 10
-                   maxrows   = 25
-                   cols      = constants.COMMENT_COLS
-        %]
-        [% Hook.process("after_comment_textarea", 'bug/edit.html.tmpl') %]
+        [% IF bug.check_can_change_field('longdesc', 0, 1) %]
+          [% INCLUDE global/textarea.html.tmpl
+                     name      = 'comment'
+                     id        = 'comment'
+                     minrows   = 10
+                     maxrows   = 25
+                     cols      = constants.COMMENT_COLS
+          %]
+          [% Hook.process("after_comment_textarea", 'bug/edit.html.tmpl') %]
+        [% ELSE %]
+          You are not allowed to make an additional comment on this [% terms.bug %].
+        [% END %]
         <br>
         [% PROCESS commit_button id=""%]
 

From a9e6eab8763346ca2f976a0e7f90f6dc6b07857a Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Fri, 15 Feb 2013 14:08:31 +0800
Subject: [PATCH 047/240] Bug 830330: Make flags honour
 bug_check_can_change_field r=dkl, a=LpSolit

---
 Bugzilla/Bug.pm                         | 4 ++--
 Bugzilla/Flag.pm                        | 6 ++++++
 template/en/default/flag/list.html.tmpl | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 547e35fa7..5069214ba 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -4085,8 +4085,8 @@ sub check_can_change_field {
         return 1;
     }
 
-    # Allow anyone to change comments.
-    if ($field =~ /^longdesc/) {
+    # Allow anyone to change comments, or set flags
+    if ($field =~ /^longdesc/ || $field eq 'flagtypes.name') {
         return 1;
     }
 
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 3660e2a7f..98029a1b1 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -294,6 +294,12 @@ sub set_flag {
         ThrowCodeError('flag_unexpected_object', { 'caller' => ref $obj });
     }
 
+    # Make sure the user can change flags
+    my $privs;
+    $bug->check_can_change_field('flagtypes.name', 0, 1, \$privs)
+        || ThrowUserError('illegal_change',
+                          { field => 'flagtypes.name', privs => $privs });
+
     # Update (or delete) an existing flag.
     if ($params->{id}) {
         my $flag = $class->check({ id => $params->{id} });
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 88486c7f6..7a3f88fc5 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -6,7 +6,7 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% IF user.id AND !read_only_flags %]
+[% IF user.id && !read_only_flags && bug.check_can_change_field('flagtypes.name', 0, 1) %]
 
 [%# We list flags by looping twice over the flag types relevant for the bug.
   # In the first loop, we display existing flags and then, for active types,

From 116103ee6a8c5195871adfa13d8ee1cfc8bafc5c Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Fri, 15 Feb 2013 15:16:48 +0100
Subject: [PATCH 048/240] Bug 838846: In Product.get, include_fields =>
 ['components'] no longer returns data about components r/a=LpSolit

---
 Bugzilla/WebService.pm         |  7 +++++++
 Bugzilla/WebService/Product.pm | 36 ++++++++++++++++++++--------------
 Bugzilla/WebService/Util.pm    | 17 ++++++++++++----
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/Bugzilla/WebService.pm b/Bugzilla/WebService.pm
index 67aa21374..5b2825375 100644
--- a/Bugzilla/WebService.pm
+++ b/Bugzilla/WebService.pm
@@ -275,6 +275,13 @@ the returned hashes.
 If you specify all the fields, then this function will return empty
 hashes.
 
+Some RPC calls support specifying sub fields. If an RPC call states that
+it support sub field restrictions, you can restrict what information is
+returned within the first field. For example, if you call Products.get
+with an include_fields of components.name, then only the component name
+would be returned (and nothing else). You can include the main field,
+and exclude a sub field.
+
 Invalid field names are ignored.
 
 Specifying fields here overrides C<include_fields>, so if you specify a
diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm
index fc48ecd88..755477acf 100644
--- a/Bugzilla/WebService/Product.pm
+++ b/Bugzilla/WebService/Product.pm
@@ -214,12 +214,12 @@ sub _product_to_hash {
     }
     if (filter_wants($params, 'versions')) {
         $field_data->{versions} = [map {
-            $self->_version_to_hash($_)
+            $self->_version_to_hash($_, $params)
         } @{$product->versions}];
     }
     if (filter_wants($params, 'milestones')) {
         $field_data->{milestones} = [map {
-            $self->_milestone_to_hash($_)
+            $self->_milestone_to_hash($_, $params)
         } @{$product->milestones}];
     }
     return filter($params, $field_data);
@@ -243,23 +243,26 @@ sub _component_to_hash {
             0,
         is_active =>
             $self->type('boolean', $component->is_active),
-        flag_types => {
+    };
+
+    if (filter_wants($params, 'flag_types', 'components')) {
+        $field_data->{flag_types} = {
             bug =>
                 [map {
-                    $self->_flag_type_to_hash($_, $params)
+                    $self->_flag_type_to_hash($_)
                 } @{$component->flag_types->{'bug'}}],
             attachment =>
                 [map {
-                    $self->_flag_type_to_hash($_, $params)
+                    $self->_flag_type_to_hash($_)
                 } @{$component->flag_types->{'attachment'}}],
-        }
-    };
-    return filter($params, $field_data, 'component');
+        };
+    }
+    return filter($params, $field_data, 'components');
 }
 
 sub _flag_type_to_hash {
-    my ($self, $flag_type, $params) = @_;
-    my $field_data = {
+    my ($self, $flag_type) = @_;
+    return {
         id =>
             $self->type('int', $flag_type->id),
         name =>
@@ -283,12 +286,11 @@ sub _flag_type_to_hash {
         request_group =>
             $self->type('int', $flag_type->request_group_id),
     };
-    return filter($params, $field_data, 'flag_type');
 }
 
 sub _version_to_hash {
-    my ($self, $version) = @_;
-    return {
+    my ($self, $version, $params) = @_;
+    my $field_data = {
         id =>
             $self->type('int', $version->id),
         name =>
@@ -298,11 +300,12 @@ sub _version_to_hash {
         is_active =>
             $self->type('boolean', $version->is_active),
     };
+    return filter($params, $field_data, 'versions');
 }
 
 sub _milestone_to_hash {
-    my ($self, $milestone) = @_;
-    return {
+    my ($self, $milestone, $params) = @_;
+    my $field_data = {
         id =>
             $self->type('int', $milestone->id),
         name =>
@@ -312,6 +315,7 @@ sub _milestone_to_hash {
         is_active =>
             $self->type('boolean', $milestone->is_active),
     };
+    return filter($params, $field_data, 'milestones');
 }
 
 1;
@@ -419,6 +423,8 @@ In addition to the parameters below, this method also accepts the
 standard L<include_fields|Bugzilla::WebService/include_fields> and
 L<exclude_fields|Bugzilla::WebService/exclude_fields> arguments.
 
+This RPC call supports sub field restrictions.
+
 =over
 
 =item C<ids>
diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index 9e20a1e06..d2a8de85c 100644
--- a/Bugzilla/WebService/Util.pm
+++ b/Bugzilla/WebService/Util.pm
@@ -43,11 +43,20 @@ sub filter_wants ($$;$) {
 
     $field = "${prefix}.${field}" if $prefix;
 
-    if (defined $params->{include_fields}) {
-        return 0 if !$include{$field};
+    if (defined $params->{exclude_fields} && $exclude{$field}) {
+        return 0;
     }
-    if (defined $params->{exclude_fields}) {
-        return 0 if $exclude{$field};
+    if (defined $params->{include_fields} && !$include{$field}) {
+        if ($prefix) {
+            # Include the field if the parent is include (and this one is not excluded)
+            return 0 if !$include{$prefix};
+        }
+        else {
+            # We want to include this if one of the sub keys is included
+            my $key = $field . '.';
+            my $len = length($key);
+            return 0 if ! grep { substr($_, 0, $len) eq $key  } keys %include;
+        }
     }
 
     return 1;

From 28cf925024ddf35e3f0ce2d5779d873669581f1f Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Sat, 16 Feb 2013 22:55:07 +0100
Subject: [PATCH 049/240] Bug 840824: It is possible to create a new bug with a
 non active target milestone, version or component r/a=LpSolit

---
 Bugzilla/Bug.pm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 5069214ba..b3f782002 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1465,8 +1465,7 @@ sub _check_component {
     $name || ThrowUserError("require_component");
     my $product = blessed($invocant) ? $invocant->product_obj 
                                      : $params->{product};
-    my $old_comp = blessed($invocant) ? $invocant->component
-                                      : $params->{component};
+    my $old_comp = blessed($invocant) ? $invocant->component : '';
     my $object = Bugzilla::Component->check({ product => $product, name => $name });
     if ($object->name ne $old_comp && !$object->is_active) {
         ThrowUserError('value_inactive', { class => ref($object), value => $name });
@@ -1929,8 +1928,7 @@ sub _check_target_milestone {
     my ($invocant, $target, undef, $params) = @_;
     my $product = blessed($invocant) ? $invocant->product_obj 
                                      : $params->{product};
-    my $old_target = blessed($invocant) ? $invocant->target_milestone
-                                        : $params->{target_milestone};
+    my $old_target = blessed($invocant) ? $invocant->target_milestone : '';
     $target = trim($target);
     $target = $product->default_milestone if !defined $target;
     my $object = Bugzilla::Milestone->check(
@@ -1960,8 +1958,7 @@ sub _check_version {
     $version = trim($version);
     my $product = blessed($invocant) ? $invocant->product_obj 
                                      : $params->{product};
-    my $old_vers = blessed($invocant) ? $invocant->version
-                                      : $params->{version};
+    my $old_vers = blessed($invocant) ? $invocant->version : '';
     my $object = Bugzilla::Version->check({ product => $product, name => $version });
     if ($object->name ne $old_vers && !$object->is_active) {
         ThrowUserError('value_inactive', { class => ref($object), value => $version });

From 20914ad41c7dc09797978ca465b0f0993c3990f2 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Sat, 16 Feb 2013 23:21:49 +0100
Subject: [PATCH 050/240] Bug 825758: Most Bugzilla::BugUrl::* modules
 incorrectly validate the domain name r/a=LpSolit

---
 Bugzilla/BugUrl/Debian.pm                    | 2 +-
 Bugzilla/BugUrl/GitHub.pm                    | 2 +-
 Bugzilla/BugUrl/Google.pm                    | 2 +-
 Bugzilla/BugUrl/Launchpad.pm                 | 2 +-
 Bugzilla/BugUrl/SourceForge.pm               | 2 +-
 extensions/MoreBugUrl/lib/GetSatisfaction.pm | 2 +-
 extensions/MoreBugUrl/lib/PHP.pm             | 4 ++--
 extensions/MoreBugUrl/lib/RT.pm              | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Bugzilla/BugUrl/Debian.pm b/Bugzilla/BugUrl/Debian.pm
index 7ab8bf173..97ad4b545 100644
--- a/Bugzilla/BugUrl/Debian.pm
+++ b/Bugzilla/BugUrl/Debian.pm
@@ -22,7 +22,7 @@ sub should_handle {
     # Debian BTS URLs can look like various things:
     #   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234
     #   http://bugs.debian.org/1234
-    return ($uri->authority =~ /^bugs.debian.org$/i
+    return (lc($uri->authority) eq 'bugs.debian.org'
             and (($uri->path =~ /bugreport\.cgi$/
                   and $uri->query_param('bug') =~ m|^\d+$|)
                  or $uri->path =~ m|^/\d+$|)) ? 1 : 0;
diff --git a/Bugzilla/BugUrl/GitHub.pm b/Bugzilla/BugUrl/GitHub.pm
index dbcaf655f..2c35bfb08 100644
--- a/Bugzilla/BugUrl/GitHub.pm
+++ b/Bugzilla/BugUrl/GitHub.pm
@@ -21,7 +21,7 @@ sub should_handle {
 
     # GitHub issue URLs have only one form:
     #  https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/issues/111
-    return ($uri->authority =~ /^github.com$/i
+    return (lc($uri->authority) eq 'github.com'
             and $uri->path =~ m|^/[^/]+/[^/]+/issues/\d+$|) ? 1 : 0;
 }
 
diff --git a/Bugzilla/BugUrl/Google.pm b/Bugzilla/BugUrl/Google.pm
index eb9aa88f2..dd9ab7ff4 100644
--- a/Bugzilla/BugUrl/Google.pm
+++ b/Bugzilla/BugUrl/Google.pm
@@ -21,7 +21,7 @@ sub should_handle {
 
     # Google Code URLs only have one form:
     #   http(s)://code.google.com/p/PROJECT_NAME/issues/detail?id=1234
-    return ($uri->authority =~ /^code.google.com$/i
+    return (lc($uri->authority) eq 'code.google.com'
             and $uri->path =~ m|^/p/[^/]+/issues/detail$|
             and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
 }
diff --git a/Bugzilla/BugUrl/Launchpad.pm b/Bugzilla/BugUrl/Launchpad.pm
index 43c5c57d9..3409cbe19 100644
--- a/Bugzilla/BugUrl/Launchpad.pm
+++ b/Bugzilla/BugUrl/Launchpad.pm
@@ -23,7 +23,7 @@ sub should_handle {
     #   https://bugs.launchpad.net/ubuntu/+bug/1234
     #   https://launchpad.net/bugs/1234
     # All variations end with either "/bugs/1234" or "/+bug/1234"
-    return ($uri->authority =~ /launchpad.net$/
+    return ($uri->authority =~ /launchpad\.net$/
             and $uri->path =~ m|bugs?/\d+$|) ? 1 : 0;
 }
 
diff --git a/Bugzilla/BugUrl/SourceForge.pm b/Bugzilla/BugUrl/SourceForge.pm
index 90a7ca6a5..630b97d7a 100644
--- a/Bugzilla/BugUrl/SourceForge.pm
+++ b/Bugzilla/BugUrl/SourceForge.pm
@@ -21,7 +21,7 @@ sub should_handle {
 
     # SourceForge tracker URLs have only one form:
     #  http://sourceforge.net/tracker/?func=detail&aid=111&group_id=111&atid=111
-    return ($uri->authority =~ /^sourceforge.net$/i
+    return (lc($uri->authority) eq 'sourceforge.net'
             and $uri->path =~ m|/tracker/|
             and $uri->query_param('func') eq 'detail'
             and $uri->query_param('aid')
diff --git a/extensions/MoreBugUrl/lib/GetSatisfaction.pm b/extensions/MoreBugUrl/lib/GetSatisfaction.pm
index 4c077b1a6..75d5ece39 100644
--- a/extensions/MoreBugUrl/lib/GetSatisfaction.pm
+++ b/extensions/MoreBugUrl/lib/GetSatisfaction.pm
@@ -20,7 +20,7 @@ sub should_handle {
 
     # GetSatisfaction URLs only have one form:
     #   http(s)://getsatisfaction.com/PROJECT_NAME/topics/TOPIC_NAME
-    return ($uri->authority =~ /^getsatisfaction.com$/i
+    return (lc($uri->authority) eq 'getsatisfaction.com'
             and $uri->path =~ m|^/[^/]+/topics/[^/]+$|) ? 1 : 0;
 }
 
diff --git a/extensions/MoreBugUrl/lib/PHP.pm b/extensions/MoreBugUrl/lib/PHP.pm
index 1521cae1a..ea090e865 100644
--- a/extensions/MoreBugUrl/lib/PHP.pm
+++ b/extensions/MoreBugUrl/lib/PHP.pm
@@ -20,8 +20,8 @@ sub should_handle {
 
     # PHP Bug URLs have only one form:
     #   https://bugs.php.net/bug.php?id=1234
-    return ($uri->authority =~ /^bugs.php.net$/i
-            and $uri->path =~ m|/bug.php$|
+    return (lc($uri->authority) eq 'bugs.php.net'
+            and $uri->path =~ m|/bug\.php$|
             and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
 }
 
diff --git a/extensions/MoreBugUrl/lib/RT.pm b/extensions/MoreBugUrl/lib/RT.pm
index 724456828..a1ca6fd88 100644
--- a/extensions/MoreBugUrl/lib/RT.pm
+++ b/extensions/MoreBugUrl/lib/RT.pm
@@ -21,7 +21,7 @@ sub should_handle {
     # RT URLs can look like various things:
     #   http://example.com/rt/Ticket/Display.html?id=1234
     #   https://example.com/Public/Bug/Display.html?id=1234
-    return ($uri->path =~ m|/Display.html$|
+    return ($uri->path =~ m|/Display\.html$|
             and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
 }
 

From 36df39e609f900b6be4300fb03c471a961ed4101 Mon Sep 17 00:00:00 2001
From: Albert Ting <altlist@gmail.com>
Date: Sat, 16 Feb 2013 23:44:08 +0100
Subject: [PATCH 051/240] Bug 836436: Add a "search_tabs" hook to allow
 additional search tabs r/a=LpSolit

---
 .../default/hook/search/tabs-search_tabs.html.tmpl  | 13 +++++++++++++
 template/en/default/search/tabs.html.tmpl           | 12 ++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 extensions/Example/template/en/default/hook/search/tabs-search_tabs.html.tmpl

diff --git a/extensions/Example/template/en/default/hook/search/tabs-search_tabs.html.tmpl b/extensions/Example/template/en/default/hook/search/tabs-search_tabs.html.tmpl
new file mode 100644
index 000000000..c40cb6e5e
--- /dev/null
+++ b/extensions/Example/template/en/default/hook/search/tabs-search_tabs.html.tmpl
@@ -0,0 +1,13 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% 
+    tabs.push ({ name => 'newsearch', label => "New Search",
+                 link => "query.cgi?format=newsearch" }) 
+%]
+
diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl
index f7703fd92..74569dceb 100644
--- a/template/en/default/search/tabs.html.tmpl
+++ b/template/en/default/search/tabs.html.tmpl
@@ -10,11 +10,15 @@
   # This template has no interface.
   #%]
 
+[% tabs = [ { name => 'specific', label => "Simple Search",
+              link => "query.cgi?format=specific" },
+            { name => 'advanced', label => "Advanced Search",
+              link => "query.cgi?format=advanced" } ] %]
+
+[% Hook.process('search_tabs') %]
+
 [% WRAPPER global/tabs.html.tmpl
-     tabs = [ { name => 'specific', label => "Simple Search",
-                link => "query.cgi?format=specific" },
-              { name => 'advanced', label => "Advanced Search",
-                link => "query.cgi?format=advanced" } ]
+     tabs = tabs
      current_tab_name = query_format || format || "advanced"
 %]
 

From 228f1caf89c50e61d19ab8884fea4f42a217c00a Mon Sep 17 00:00:00 2001
From: Matt Tyson <mtyson@redhat.com>
Date: Sun, 17 Feb 2013 02:16:55 +0100
Subject: [PATCH 052/240] Bug 839950: Cannot search by Change History on
 multi-select fields r/a=LpSolit

---
 Bugzilla/Bug.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index b3f782002..703ef1bb6 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3770,9 +3770,13 @@ sub bug_alias_to_id {
 # Subroutines
 #####################################################################
 
-# Represents which fields from the bugs table are handled by process_bug.cgi.
+# Returns a list of currently active and editable bug fields,
+# including multi-select fields.
 sub editable_bug_fields {
     my @fields = Bugzilla->dbh->bz_table_columns('bugs');
+    # Add multi-select fields
+    push(@fields, map { $_->name } @{Bugzilla->fields({obsolete => 0,
+                                                       type => FIELD_TYPE_MULTI_SELECT})});
     # Obsolete custom fields are not editable.
     my @obsolete_fields = @{ Bugzilla->fields({obsolete => 1, custom => 1}) };
     @obsolete_fields = map { $_->name } @obsolete_fields;
@@ -3780,7 +3784,7 @@ sub editable_bug_fields {
                         "lastdiffed", @obsolete_fields) 
     {
         my $location = firstidx { $_ eq $remove } @fields;
-        # Custom multi-select fields are not stored in the bugs table.
+        # Ensure field exists before attempting to remove it.
         splice(@fields, $location, 1) if ($location > -1);
     }
     return @fields;

From 375cc00b8181207b8e63d6c861f6f8d8fdb1006f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sun, 17 Feb 2013 03:17:18 +0100
Subject: [PATCH 053/240] Fix regression due to bug 830330

---
 template/en/default/flag/list.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 7a3f88fc5..4d7eefb48 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -6,7 +6,7 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% IF user.id && !read_only_flags && bug.check_can_change_field('flagtypes.name', 0, 1) %]
+[% IF user.id && !read_only_flags && (!bug || bug.check_can_change_field('flagtypes.name', 0, 1)) %]
 
 [%# We list flags by looping twice over the flag types relevant for the bug.
   # In the first loop, we display existing flags and then, for active types,

From 27715b99af88cef73f73a84ee8d74e31c64a80cf Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Sun, 17 Feb 2013 13:14:01 +0100
Subject: [PATCH 054/240] Bug 601875: Display the "allow UNCONFIRMED" column
 when listing products in editproducts.cgi r/a=LpSolit

---
 template/en/default/admin/products/list.html.tmpl | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl
index a5126afc3..0776b677c 100644
--- a/template/en/default/admin/products/list.html.tmpl
+++ b/template/en/default/admin/products/list.html.tmpl
@@ -29,21 +29,26 @@
 %]
 
 [% columns = [
-     { 
+     {
        name => "name"
        heading => "Edit product..."
        contentlink => 'editproducts.cgi?action=edit&amp;product=%%name%%'
      },
-     { 
+     {
        name => "description"
        heading => "Description"
        allow_html_content => 1
      },
-     { 
+     {
        name => "is_active"
        heading => "Open For New $terms.Bugs"
        yesno_field => 1
      },
+     {
+       name => "allows_unconfirmed"
+       heading => "Allow UNCONFIRMED $terms.Bugs"
+       yesno_field => 1
+     },
 ] %]
 
 [% IF showbugcounts %]

From 5654419293f789e6e5f1b17c857bf8998f0c9811 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Sun, 17 Feb 2013 21:24:56 -0500
Subject: [PATCH 055/240] Bug 824346 - The flaginclusions and flagexclusions DB
 tables have no UNIQUE index r/a=LpSolit

---
 Bugzilla/DB/Schema.pm  |  8 ++++----
 Bugzilla/Install/DB.pm | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 058e78a5f..f92d0aeb7 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -640,8 +640,8 @@ use constant ABSTRACT_SCHEMA => {
                                             DELETE => 'CASCADE'}},
         ],
         INDEXES => [
-            flaginclusions_type_id_idx =>
-                [qw(type_id product_id component_id)],
+            flaginclusions_type_id_idx => { FIELDS => [qw(type_id product_id component_id)],
+                                            TYPE   => 'UNIQUE' },
         ],
     },
 
@@ -661,8 +661,8 @@ use constant ABSTRACT_SCHEMA => {
                                             DELETE => 'CASCADE'}},
         ],
         INDEXES => [
-            flagexclusions_type_id_idx =>
-                [qw(type_id product_id component_id)],
+            flagexclusions_type_id_idx => { FIELDS => [qw(type_id product_id component_id)],
+                                            TYPE   => 'UNIQUE' },
         ],
     },
 
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index cb7276fb9..3170babf6 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -708,6 +708,9 @@ sub update_table_definitions {
     # 2013-01-02 LpSolit@gmail.com - Bug 824361
     _fix_longdescs_indexes();
 
+    # 2013-02-04 dkl@mozilla.com - Bug 824346
+    _fix_flagclusions_indexes();
+
     ################################################################
     # New --TABLE-- changes should go *** A B O V E *** this point #
     ################################################################
@@ -3825,6 +3828,35 @@ sub _add_password_salt_separator {
     $dbh->bz_commit_transaction();
 }
 
+sub _fix_flagclusions_indexes {
+    my $dbh = Bugzilla->dbh;
+    foreach my $table ('flaginclusions', 'flagexclusions') {
+        my $index = $table . '_type_id_idx';
+        my $idx_info = $dbh->bz_index_info($table, $index);
+        if ($idx_info && $idx_info->{'TYPE'} ne 'UNIQUE') {
+            # Remove duplicated entries
+            my $dupes = $dbh->selectall_arrayref("
+                SELECT type_id, product_id, component_id, COUNT(*) AS count
+                  FROM $table " .
+                $dbh->sql_group_by('type_id, product_id, component_id') . "
+                HAVING COUNT(*) > 1",
+                { Slice => {} });
+            say "Removing duplicated entries from the '$table' table..." if @$dupes;
+            foreach my $dupe (@$dupes) {
+                $dbh->do("DELETE FROM $table 
+                          WHERE type_id = ? AND product_id = ? AND component_id = ?",
+                         undef, $dupe->{type_id}, $dupe->{product_id}, $dupe->{component_id});
+                $dbh->do("INSERT INTO $table (type_id, product_id, component_id) VALUES (?, ?, ?)",
+                         undef, $dupe->{type_id}, $dupe->{product_id}, $dupe->{component_id});
+            }
+            $dbh->bz_drop_index($table, $index);
+            $dbh->bz_add_index($table, $index,
+                { FIELDS => [qw(type_id product_id component_id)],
+                  TYPE   => 'UNIQUE' });
+        }
+    }
+}
+
 1;
 
 __END__

From 6e25fd4189841da028213de685b3d6acb3aeba05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 18 Feb 2013 13:26:51 +0100
Subject: [PATCH 056/240] Bug 842063: HTML injection is possible using the bug
 alias r=dkl a=LpSolit

---
 template/en/default/bug/show-header.html.tmpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index 54d51dd4f..f67bbf2f8 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -13,12 +13,14 @@
   # be overridden by the calling templates.
   #%]
 
+[% filtered_alias = bug.alias FILTER html %]
 [% filtered_desc = bug.short_desc FILTER html %]
-[% subheader = filtered_desc %]
 [% filtered_timestamp = bug.delta_ts FILTER time %]
+
+[% subheader = filtered_desc %]
 [% title = "$terms.Bug $bug.bug_id &ndash; " %]
 [% IF bug.alias != '' %]
-  [% title = title _ "($bug.alias) " %]
+  [% title = title _ "($filtered_alias) " %]
 [% END %]
 [% title = title _ filtered_desc %]
 [% yui = ['autocomplete', 'calendar'] %]

From d079beffe92e60b7ea9114c671c83e9190925fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 19 Feb 2013 10:06:36 +0100
Subject: [PATCH 057/240] Bug 832262: Release notes for Bugzilla 4.4rc2 r=dkl
 a=LpSolit

---
 .../en/default/pages/release-notes.html.tmpl  | 70 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 3 deletions(-)

diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 3972723f0..5fab4615c 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -81,7 +81,7 @@
 <h3 id="v44_req_modules">Required Perl Modules</h3>
 
 [% INCLUDE req_table reqs = REQUIRED_MODULES
-                     updated = ['TimeDate', 'DBI', 'Email-Send'] %]
+                     updated = ['TimeDate', 'DBI', 'Email-Send', 'List-MoreUtils'] %]
 
 <h3 id="v44_req_optional_mod">Optional Perl Modules</h3>
 
@@ -116,6 +116,8 @@
 <h2 id="v44_feat">New Features and Improvements</h2>
 
 <ul>
+  <li><a href="#v44_feat_search">Allow Multiple Search Criteria to Match one Field</a></li>
+  <li><a href="#v44_feat_search_perf">Improved Performance for Searches</a></li>
   <li><a href="#v44_feat_bug_tags">Overhaul of the Tagging System</a></li>
   <li><a href="#v44_feat_mimetype_autodetect">Auto-Detection of the Attachment MIME Type</a></li>
   <li><a href="#v44_feat_saved_reports">Saving Tabular and Graphical Reports</a></li>
@@ -125,6 +127,43 @@
   <li><a href="#v44_feat_other">Other Enhancements and Changes</a></li>
 </ul>
 
+<h3 id="v44_feat_search">Allow Multiple Search Criteria to Match one Field</h3>
+
+<p>
+  In the "Advanced Search" page, it is now possible to build queries using
+  multiple custom search criteria against the same field. In [% terms.Bugzilla %]
+  4.2 and older, queries of the form
+  <br><br>
+  <kbd>"Status changed to VERIFIED" AND "Status changed by foo@bar.com"</kbd>
+  <br><br>
+  were returning all [% terms.bugs %] which had their status changed to VERIFIED
+  by some user and which were edited by foo@bar.com once, but both actions could
+  be independent. In [% terms.Bugzilla %] 4.4, you can now decide if both
+  criteria must match the exact same action or not, i.e. if you want
+  [%+ terms.bugs %] whose status has been set to VERIFIED by foo@bar.com himself.
+  In the same way, queries of the form
+  <br><br>
+  <kbd>"Flags changed to approval+" AND "Flags changed by foo@bar.com"</kbd>
+  <br><br>
+  can now return [% terms.bugs %] for which the approval flag has been set to
+  "+" by foo@bar.com himself. In previous versions, both actions were treated
+  independently and [% terms.bugs %] for which foo@bar.com set the approval flag
+  to "?" and which is then set to "+" by someone else were also returned.
+</p>
+<p>
+  This new feature gives you the ability to build more accurate queries and to
+  get more relevant results.
+</p>
+
+<h3 id="v44_feat_search_perf">Improved Performance for Searches</h3>
+
+<p>
+  The search system got a performance boost which in some cases decreases the
+  time spent to run queries from several minutes to a few seconds only.
+  The more complex your queries are, and the more visible the performance win
+  should be.
+</p>
+
 <h3 id="v44_feat_bug_tags">Overhaul of the Tagging System</h3>
 
 <p>
@@ -266,6 +305,8 @@
     are no longer resolved to their [% terms.bug %] ID, meaning that it is no
     longer possible to connect an alias with its ID unless you can see the
     [%+ terms.bug %].</li>
+  <li><strong>Searches:</strong> Custom multi-select fields are now available
+    in the "Search By Change History" section of the query page.</li>
   <li><strong>Searches:</strong> The <em>changed by</em> operator in boolean
     charts now accepts pronouns.</li>
   <li><strong>Searches:</strong> The requester and requestee fields in boolean
@@ -283,6 +324,9 @@
     notifications when the product or component of [% terms.abug %] changes.</li>
   <li><strong>Email Notifications:</strong> All [% terms.bug %]mails now have
     a <em>X-Bugzilla-Flags</em> email header, listing currently set flags.</li>
+  <li><strong>Email Notifications:</strong> All [% terms.bug %]mails now have
+    a <em>X-Bugzilla-Version</em> email header with the current product
+    version.</li>
   <li><strong>Whining:</strong> The sort order of the saved search is used to
     sort [% terms.bugs %] in the emails.</li>
   <li><strong>User Accounts:</strong> To confirm an email address change, the
@@ -297,6 +341,9 @@
     <em>X-Priority</em> email headers to increase or decrease the initial
     priority of the [% terms.bug %], unless the priority is already explicitly
     set in the email itself.</li>
+  <li><strong>Skins:</strong> [% terms.Bugzilla %] no longer fetches all skins
+    available when viewing a page. It only loads the skin selected by the user
+    in his preferences, which results in less requests to the server.</li>
 </ul>
 
 <h4>Enhancements for Administrators and Developers</h4>
@@ -330,6 +377,9 @@
   <li><strong>Administration:</strong> Target milestones can now be 64 characters
     long, for consistency with versions (previously was limited to 20 characters
     only).</li>
+  <li><strong>Administration:</strong> The result code returned by
+    <kbd>contrib/bugzilla-queue.rhel</kbd> when it's not running is now 2
+    instead of 0.</li>
   <li><strong>Database:</strong> Support for Oracle has been greatly improved.</li>
   <li><strong>Security:</strong> For improved security, the
     "X-Content-Type-Options:&nbsp;nosniff" and "X-XSS-Protection:&nbsp;block"
@@ -347,6 +397,8 @@
     <kbd>B[%%]ugzilla.parameters</kbd>, <kbd>B[%%]ugzilla.last_audit_time</kbd>,
     <kbd>Classification.get</kbd>, <kbd>Group.update</kbd>,
     <kbd>Product.update</kbd>, <kbd>User.update</kbd>.</li>
+  <li><kbd>B[%%]ug.add_attachment</kbd> now only returns the ID of the newly
+    created attachments instead of all the attachment data.</li>
   <li><kbd>B[%%]ug.attachments</kbd> now also returns the <kbd>size</kbd> field
     containing the size of the attachment.</li>
   <li><kbd>B[%%]ug.attachments</kbd> and <kbd>B[%%]ug.get</kbd> now return
@@ -436,6 +488,9 @@
     tables and columns are joined in queries. In combination with the
     <kbd>buglist_columns</kbd> hook, this permits to customize the list of
     columns to display in buglists.</li>
+  <li>There is a new code hook <kbd>bug_start_of_update</kbd> which is called
+    after <kbd>object_end_of_update</kbd> but before <kbd>bug_end_of_update</kbd>
+    for a better control on how to update [% terms.bugs %].</li>
   <li>There is a new code hook <kbd>bug_url_sub_classes</kbd> to support
     additional URLs in the See Also field.</li>
   <li>There is a new code hook <kbd>error_catch</kbd> to catch errors thrown
@@ -446,6 +501,15 @@
   <li>It is now illegal to have a product with no components and no versions.
     Trying to delete the last component or version of a product is now
     rejected.</li>
+  <li>Trying to set the component, target milestone or version of [% terms.abug %]
+    to a disabled value is no longer accepted. The change will be rejected.</li>
+  <li>The comment box now checks the returned value of check_can_change_field()
+    to determine if it should be displayed or not. This means its visibility
+    can now be controlled by the <kbd>bug_check_can_change_field</kbd> hook.</li>
+  <li>Flags now checks the returned value of check_can_change_field() to
+    determine if they should appear as editable or not. This means their
+    visibility can now be controlled by the <kbd>bug_check_can_change_field</kbd>
+    hook.</li>
   <li>Quips can no longer exceed 512 characters. Existing quips longer than
     that are automatically truncated when upgrading.</li>
   <li>The static <kbd>bugzilla.dtd</kbd> file has been replaced by a dynamic
@@ -467,8 +531,8 @@
   <li>It is now legal to call <kbd>B[%%]ugzilla::Version->check({ id => $id })</kbd>
     and <kbd>B[%%]ugzilla::Milestone->check({ id => $id })</kbd> to validate
     and get an object using its ID.</li>
-  <li>Rows in the <kbd>dependencies</kbd> DB table are now enforced to be
-    unique.</li>
+  <li>Rows in the <kbd>dependencies</kbd>, <kbd>flaginclusions</kbd> and
+    <kbd>flagexclusions</kbd> DB tables are now enforced to be unique.</li>
   <li>The <kbd>b[%%]ugs_activity</kbd> and <kbd>profiles_activity</kbd> DB
     tables now have an auto-incremented primary key named <kbd>id</kbd>.</li>
   <li>A custom <kbd>B[%%]ugzilla.pm</kbd> module has been added into

From 350cff07f5796d1462b0c86fc8c6e25f8fda5352 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Tue, 19 Feb 2013 18:11:40 +0100
Subject: [PATCH 058/240] Bug 824399: (CVE-2013-0786) [SECURITY]
 build_subselect() leaks the existence of products and components you cannot
 access r/a=LpSolit

---
 Bugzilla/Config/GroupSecurity.pm                         | 8 ++++++++
 buglist.cgi                                              | 5 ++++-
 report.cgi                                               | 8 +++++++-
 template/en/default/admin/params/groupsecurity.html.tmpl | 3 +++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Config/GroupSecurity.pm b/Bugzilla/Config/GroupSecurity.pm
index d5f02f42d..d57573de3 100644
--- a/Bugzilla/Config/GroupSecurity.pm
+++ b/Bugzilla/Config/GroupSecurity.pm
@@ -57,6 +57,14 @@ sub get_param_list {
    checker => \&check_group
   },
   
+  {
+   name => 'debug_group',
+   type => 's',
+   choices => \&_get_all_group_names,
+   default => 'admin',
+   checker => \&check_group
+  },
+  
   {
    name => 'usevisibilitygroups',
    type => 'b',
diff --git a/buglist.cgi b/buglist.cgi
index 625b7eab8..97654cdf2 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -721,7 +721,10 @@ $::SIG{PIPE} = 'DEFAULT';
 my ($data, $extra_data) = $search->data;
 $vars->{'search_description'} = $search->search_description;
 
-if ($cgi->param('debug')) {
+if ($cgi->param('debug')
+    && Bugzilla->params->{debug_group}
+    && $user->in_group(Bugzilla->params->{debug_group})
+) {
     $vars->{'debug'} = 1;
     $vars->{'queries'} = $extra_data;
     my $query_time = 0;
diff --git a/report.cgi b/report.cgi
index 2949a18c3..5e51bd34a 100755
--- a/report.cgi
+++ b/report.cgi
@@ -258,7 +258,13 @@ $vars->{'width'} = $width;
 $vars->{'height'} = $height;
 $vars->{'queries'} = $extra_data;
 $vars->{'saved_report_id'} = $cgi->param('saved_report_id');
-$vars->{'debug'} = $cgi->param('debug');
+
+if ($cgi->param('debug')
+    && Bugzilla->params->{debug_group}
+    && Bugzilla->user->in_group(Bugzilla->params->{debug_group})
+) {
+    $vars->{'debug'} = 1;
+}
 
 if ($action eq "wrap") {
     # So which template are we using? If action is "wrap", we will be using
diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl
index 86cbedcf8..7e30f0723 100644
--- a/template/en/default/admin/params/groupsecurity.html.tmpl
+++ b/template/en/default/admin/params/groupsecurity.html.tmpl
@@ -29,6 +29,9 @@
   querysharegroup => "The name of the group of users who can share their " _
                      "saved searches with others.",
 
+  debug_group => "The name of the group of users who can view the actual " _
+                 "SQL query generated when viewing $terms.bug lists and reports.",
+
   usevisibilitygroups => "Do you wish to restrict visibility of users to members of " _
                          "specific groups?",
   

From 03f71bd515d92ea430b523eedfec74bb9cc59500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 19 Feb 2013 18:24:20 +0100
Subject: [PATCH 059/240] Bug 842038: (CVE-2013-0785) [SECURITY] XSS in
 show_bug.cgi when using an invalid page format r=glob a=LpSolit

---
 Bugzilla/Template.pm                            | 14 +++++++++-----
 show_bug.cgi                                    | 11 +++++------
 template/en/default/global/user-error.html.tmpl |  5 ++++-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 81d01b426..f70224a9c 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -96,12 +96,15 @@ sub get_format {
     my $self = shift;
     my ($template, $format, $ctype) = @_;
 
-    $ctype ||= 'html';
-    $format ||= '';
+    $ctype //= 'html';
+    $format //= '';
 
-    # Security - allow letters and a hyphen only
-    $ctype =~ s/[^a-zA-Z\-]//g;
-    $format =~ s/[^a-zA-Z\-]//g;
+    # ctype and format can have letters and a hyphen only.
+    if ($ctype =~ /[^a-zA-Z\-]/ || $format =~ /[^a-zA-Z\-]/) {
+        ThrowUserError('format_not_found', {'format' => $format,
+                                            'ctype'  => $ctype,
+                                            'invalid' => 1});
+    }
     trick_taint($ctype);
     trick_taint($format);
 
@@ -127,6 +130,7 @@ sub get_format {
     return
     {
         'template'    => $template,
+        'format'      => $format,
         'extension'   => $ctype,
         'ctype'       => Bugzilla::Constants::contenttypes->{$ctype}
     };
diff --git a/show_bug.cgi b/show_bug.cgi
index 7b9157959..3956ce4b3 100755
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -22,9 +22,11 @@ my $vars = {};
 
 my $user = Bugzilla->login();
 
+my $format = $template->get_format("bug/show", scalar $cgi->param('format'),
+                                   scalar $cgi->param('ctype'));
+
 # Editable, 'single' HTML bugs are treated slightly specially in a few places
-my $single = !$cgi->param('format')
-  && (!$cgi->param('ctype') || $cgi->param('ctype') eq 'html');
+my $single = !$format->{format} && $format->{extension} eq 'html';
 
 # If we don't have an ID, _AND_ we're only doing a single bug, then prompt
 if (!$cgi->param('id') && $single) {
@@ -34,9 +36,6 @@ if (!$cgi->param('id') && $single) {
     exit;
 }
 
-my $format = $template->get_format("bug/show", scalar $cgi->param('format'), 
-                                   scalar $cgi->param('ctype'));
-
 my (@bugs, @illegal_bugs);
 my %marks;
 
@@ -126,5 +125,5 @@ $vars->{'displayfields'} = \%displayfields;
 
 print $cgi->header($format->{'ctype'});
 
-$template->process("$format->{'template'}", $vars)
+$template->process($format->{'template'}, $vars)
   || ThrowTemplateError($template->error());
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index c9448a503..6d03eaa4b 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -741,7 +741,10 @@
     [% title = "Format Not Found" %]
     The requested format <em>[% format FILTER html %]</em> does not exist with
     a content type of <em>[% ctype FILTER html %]</em>.
-    
+    [% IF invalid %]
+      Both parameters must contain letters and hyphens only.
+    [% END %]
+
   [% ELSIF error == "flag_type_sortkey_invalid" %]
     [% title = "Flag Type Sort Key Invalid" %]
     The sort key <em>[% sortkey FILTER html %]</em> must be an integer

From 561e2f918b363fab573a84c205f8c049c59d6a63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Fri, 8 Mar 2013 12:38:50 +0100
Subject: [PATCH 060/240] Bug 848250: Bug summary tooltip now includes "---"
 for unresolved bugs r=dkl a=LpSolit

---
 template/en/default/bug/link.html.tmpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl
index 4e62e04ec..40031e16f 100644
--- a/template/en/default/bug/link.html.tmpl
+++ b/template/en/default/bug/link.html.tmpl
@@ -24,7 +24,9 @@
 [%# We use "FILTER none" here because link_title is filtered down below. %]
 [% link_title = BLOCK %]
   [% display_value('bug_status', bug.bug_status) FILTER none %]
-  [%+ display_value('resolution', bug.resolution) FILTER none %]
+  [% IF bug.resolution %]
+    [%+ display_value('resolution', bug.resolution) FILTER none %]
+  [% END %]
 [% END %]
 
 [% IF user.can_see_bug(bug) %]

From 53dfb0e158c23f1b2f2fe3d3acdc8878813c9915 Mon Sep 17 00:00:00 2001
From: Reed Loden <reed@reedloden.com>
Date: Tue, 12 Mar 2013 10:05:24 -0700
Subject: [PATCH 061/240] Bug 850126 - 'token' id defined twice on logged-out
 pages (in header and footer) [r=LpSolit a=LpSolit]

---
 template/en/default/account/auth/login-small.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 19269ea49..801fef81e 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -107,7 +107,7 @@
     <input id="forgot_button[% qs_suffix %]" value="Reset Password" 
            type="submit">
     <input type="hidden" name="a" value="reqpw">
-    <input type="hidden" id="token" name="token" value="[% issue_hash_token(['reqpw']) FILTER html %]">
+    <input type="hidden" id="token[% qs_suffix FILTER html %]" name="token" value="[% issue_hash_token(['reqpw']) FILTER html %]">
     <a href="#" onclick="return hide_forgot_form('[% qs_suffix %]')">[x]</a>
   </form>
 </li>

From 88dbbc930306134acdcd85d94e3f2e8a52b8e4a8 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 13 Mar 2013 21:30:26 +0800
Subject: [PATCH 062/240] Bug 850309: Allow pasted attachments to be flagged as
 patches r=LpSolit, a=LpSolit

---
 js/attachment.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/js/attachment.js b/js/attachment.js
index 0c1560de0..d9bdabc4e 100644
--- a/js/attachment.js
+++ b/js/attachment.js
@@ -24,13 +24,12 @@ function updateCommentPrivacy(checkbox) {
     }
 }
 
-function setContentTypeDisabledState(form)
-{
+function setContentTypeDisabledState(form) {
     var isdisabled = false;
     if (form.ispatch.checked)
         isdisabled = true;
 
-    for (var i=0 ; i<form.contenttypemethod.length ; i++)
+    for (var i = 0; i < form.contenttypemethod.length; i++)
         form.contenttypemethod[i].disabled = isdisabled;
 
     form.contenttypeselection.disabled = isdisabled;
@@ -39,9 +38,8 @@ function setContentTypeDisabledState(form)
 
 function TextFieldHandler() {
     var field_text = document.getElementById("attach_text");
-    var greyfields = new Array("data", "ispatch", "autodetect",
-                               "list", "manual", "contenttypeselection",
-                               "contenttypeentry");
+    var greyfields = new Array("data", "autodetect", "list", "manual",
+                               "contenttypeselection", "contenttypeentry");
     var i, thisfield;
     if (field_text.value.match(/^\s*$/)) {
         for (i = 0; i < greyfields.length; i++) {

From d50e3291328165f7128def1394dba3a76b9f926e Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Wed, 13 Mar 2013 11:04:15 -0400
Subject: [PATCH 063/240] Bug 850322 - make see-also's (add) button consistent
 with other buttons r=glob,a=LpSolit

---
 template/en/default/bug/field.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index ef4d0e8b1..a77f9087c 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -160,7 +160,7 @@
        [% IF Param('use_see_also') %]
          <span id="container_showhide_[% field.name FILTER html %]"
                class="bz_default_hidden">
-           <a href="#" id="showhide_[% field.name FILTER html %]">(add)</a>
+           (<a href="#" id="showhide_[% field.name FILTER html %]">add</a>)
          </span>
          <div id="container_[% field.name FILTER html %]">
            <label for="[% field.name FILTER html %]">

From e33d24639d65c5fb742a5a968190fe090bc126ff Mon Sep 17 00:00:00 2001
From: Alex Schuilenburg <alex@schuilenburg.org>
Date: Thu, 14 Mar 2013 16:51:07 -0400
Subject: [PATCH 064/240] Bug 525195 - Invisible fields still show up in the
 "New:" bugmail (fields whose visibility depends on another field)
 r=dkl,a=LpSolit

---
 Bugzilla/BugMail.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 1fb5ea977..089d3013e 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -443,11 +443,18 @@ sub _get_new_bugmail_fields {
     my $bug = shift;
     my @fields = @{ Bugzilla->fields({obsolete => 0, in_new_bugmail => 1}) };
     my @diffs;
+    my $params = Bugzilla->params;
 
     foreach my $field (@fields) {
         my $name = $field->name;
         my $value = $bug->$name;
 
+        next if !$field->is_visible_on_bug($bug)
+            || ($name eq 'classification' && !$params->{'useclassification'})
+            || ($name eq 'status_whiteboard' && !$params->{'usestatuswhiteboard'})
+            || ($name eq 'qa_contact' && !$params->{'useqacontact'})
+            || ($name eq 'target_milestone' && !$params->{'usetargetmilestone'});
+
         if (ref $value eq 'ARRAY') {
             $value = join(', ', @$value);
         }

From 20ade34bdc49f3390aa1b0ce1805e48c4299bb4f Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Sat, 16 Mar 2013 17:18:00 +0100
Subject: [PATCH 065/240] Bug 827983: "[reply]" link besides the original
 description will insert ("in reply to comment #N+1") when the comments order
 is "Newest to Oldest, but keep Descritption at the top" r/a=LpSolit

---
 template/en/default/bug/comments.html.tmpl | 41 ++++++----------------
 template/en/default/filterexceptions.pl    |  1 +
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index d2de3521c..61d1c67e0 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -55,34 +55,15 @@
     [% sort_order = "oldest_to_newest" %]
 [% END %]
 
-
-[%# Set up the variables as needed, depending on the sort order %]
-[% IF sort_order == "oldest_to_newest" %]
-    [% count = 0 %]
-    [% description = 0 %]
-    [% increment = 1 %]
-[% ELSE %]
-    [% increment = -1 %]
-    [% IF sort_order == "newest_to_oldest" %]
-        [% count = comments.size - 1 %]
-        [% description = 0 %]
-    [% ELSIF sort_order == "newest_to_oldest_desc_first" %]
-        [% count = comments.size %]
-        [% description = comments.size %]
-    [% END %]
-[% END %]
-
 <!-- This auto-sizes the comments and positions the collapse/expand links 
      to the right. -->
 <table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
 <td>
 
 [% FOREACH comment = comments %]
-  [% IF count >= start_at %]
+  [% IF comment.count >= start_at %]
     [% PROCESS a_comment %]
   [% END %]
-  
-  [% count = count + increment %]
 [% END %]
 
 [% IF mode == "edit" && user.id
@@ -126,15 +107,15 @@
   [% comment_text = comment.body_full %]
   [% RETURN IF comment_text == '' AND (comment.work_time - 0) != 0 AND !user.is_timetracker %]
 
-    <div id="c[% count %]" class="bz_comment[% " bz_private" IF comment.is_private %]
-                [% " bz_comment_hilite" IF marks.$count %]
-                [% " bz_first_comment" IF count == description %]">
-      [% IF count == description %]
+    <div id="c[% comment.count %]" class="bz_comment[% " bz_private" IF comment.is_private %]
+                [% " bz_comment_hilite" IF marks.${comment.count} %]
+                [% " bz_first_comment" IF comment.count == 0 %]">
+      [% IF comment.count == 0 %]
         [% class_name = "bz_first_comment_head" %]
         [% comment_label = "Description" %]
       [% ELSE %]
         [% class_name = "bz_comment_head" %]
-        [% comment_label = "Comment " _ count %]
+        [% comment_label = "Comment " _ comment.count %]
       [% END %]
 
       <div class="[% class_name FILTER html %]">
@@ -144,12 +125,12 @@
             [% IF bug.check_can_change_field('longdesc', 0, 1) %]
               [<a class="bz_reply_link" href="#add_comment"
                 [% IF user.settings.quote_replies.value != 'off' %]
-                  onclick="replyToComment('[% count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]'); return false;"
+                  onclick="replyToComment('[% comment.count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]'); return false;"
                 [% END %]
               >reply</a>]
             [% END %]
             <script type="text/javascript"><!--
-              addCollapseLink([% count %], 'Toggle comment display'); // -->
+              addCollapseLink([% comment.count %], 'Toggle comment display'); // -->
             </script>
           </span>
         [% END %]
@@ -161,7 +142,7 @@
             <input type="checkbox"
                    name="isprivate_[% comment.id %]" value="1"
                    id="isprivate_[% comment.id %]"
-                   onClick="updateCommentPrivacy(this, [% count %])"
+                   onClick="updateCommentPrivacy(this, [% comment.count %])"
                    [% " checked=\"checked\"" IF comment.is_private %]>
             <label for="isprivate_[% comment.id %]">Private</label>
           </div>
@@ -169,7 +150,7 @@
 
         <span class="bz_comment_number">
           <a 
-             href="show_bug.cgi?id=[% bug.bug_id %]#c[% count %]">
+             href="show_bug.cgi?id=[% bug.bug_id %]#c[% comment.count %]">
             [%- comment_label FILTER html %]</a>
         </span>
 
@@ -208,7 +189,7 @@
   # generated HTML
   #%]
 <pre class="bz_comment_text" 
-     [% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]>
+     [% ' id="comment_text_' _ comment.count _ '"' IF mode == "edit" %]>
   [%- comment_text FILTER quoteUrls(bug, comment) -%]
 </pre>
     </div>
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index e12fcb189..36b9032dd 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -199,6 +199,7 @@
 
 'bug/comments.html.tmpl' => [
   'comment.id',
+  'comment.count',
   'bug.bug_id',
 ],
 

From de1a622f4ba1f540f7b0407a597a94acde704894 Mon Sep 17 00:00:00 2001
From: Christopher Trom <chtrom@gmail.com>
Date: Sat, 16 Mar 2013 17:30:21 +0100
Subject: [PATCH 066/240] Bug 821717: Table headers in the "Saved Searches" and
 "Email Prefs" panels are wrongly right-aligned r/a=LpSolit

---
 skins/standard/global.css                                  | 5 +++++
 template/en/default/account/prefs/email.html.tmpl          | 4 ++--
 template/en/default/account/prefs/saved-searches.html.tmpl | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/skins/standard/global.css b/skins/standard/global.css
index 17b7b7c90..3ca350dba 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -354,6 +354,11 @@ table#flags td {
     text-align: left;
 }
 
+table#email_prefs th,
+table#shared_search_prefs th,
+table#saved_search_prefs th {
+    text-align: center;
+}
 .flag_select {
     min-width: 3em;
 }
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 3dbed12e0..ec21a0301 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -161,7 +161,7 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb
 
 [% num_columns = relationships.size %]
 
-<table class="bz_emailprefs" border="1">
+<table class="bz_emailprefs" id="email_prefs" border="1">
   <tr>
     <td colspan="[% num_columns FILTER html %]" align="center" width="50%">
       <b>When my relationship to this [% terms.bug %] is:</b>
@@ -173,7 +173,7 @@ document.write('<input type="button" value="Disable All Mail" onclick="SetCheckb
 
   <tr>
     [% FOREACH relationship = relationships %]
-      <th align="center" width="9%">
+      <th width="9%">
         [% relationship.description FILTER html %]
       </th>
     [% END %]
diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl
index 11d7ef868..5f5f09e04 100644
--- a/template/en/default/account/prefs/saved-searches.html.tmpl
+++ b/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -31,7 +31,7 @@
 <p>Your saved searches are as follows:</p>
 
 <blockquote>
-  <table border="1" cellpadding="3">  
+  <table id="saved_search_prefs" border="1" cellpadding="3">
     <tr>
       <th>
         Search
@@ -146,7 +146,7 @@
 [% IF user.queries_available.size %]
   <p>You may use these searches saved and shared by others:</p>
 
-  <table border="1" cellpadding="3">  
+  <table id="shared_search_prefs" border="1" cellpadding="3">
     <tr>
       <th>
         Search

From 4f9bbb0266d376c0e9c3eb2cdd39a930ff77588d Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Sat, 16 Mar 2013 17:43:25 +0100
Subject: [PATCH 067/240] Bug 830053: Should link to account information from
 the email preferences tab r/a=LpSolit

---
 template/en/default/account/prefs/email.html.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index ec21a0301..3fcb86176 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -28,6 +28,12 @@
   </div>
 [% END %]
 
+<p>
+  If you want to change your e-mail address <b>[% user.email FILTER html %]</b>
+  to which [% terms.Bugzilla %] sends notifications, click the "Account
+  Information" tab above.
+</p>
+
 <p>
   If you don't like getting a notification for "trivial"
   changes to [% terms.bugs %], you can use the settings below to

From c8dccff5fb08e03f47fa5ea1b80c183cb5e5e7f2 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 20 Mar 2013 00:15:33 +0800
Subject: [PATCH 068/240] Bug 852445: Mime type detection truncates the first
 32 bytes from attachments r=LpSolit,r=LpSolit

---
 Bugzilla/Attachment.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 3678424c9..df1a11fcc 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -546,6 +546,7 @@ sub _check_content_type {
         }
 
         my $mimetype = mimetype($fh);
+        $fh->seek(0, 0);
         $content_type = $mimetype if $mimetype;
     }
 

From 5c992ac2ebf8b4c9d38bea207d197411a754dfcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 20 Mar 2013 13:03:08 +0100
Subject: [PATCH 069/240] Bug 852560: Bugzilla cannot be installed with MySQL
 5.6, because the have_innodb variable no longer exists r=glob a=LpSolit

---
 Bugzilla/DB/Mysql.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index 78d0908fa..908e12721 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -308,9 +308,8 @@ sub bz_setup_database {
     # hard to fix later. We do this up here because none of the code below
     # works if InnoDB is off. (Particularly if we've already converted the
     # tables to InnoDB.)
-    my ($innodb_on) = @{$self->selectcol_arrayref(
-        q{SHOW VARIABLES LIKE '%have_innodb%'}, {Columns=>[2]})};
-    if ($innodb_on ne 'YES') {
+    my %engines = @{$self->selectcol_arrayref('SHOW ENGINES', {Columns => [1,2]})};
+    if (!$engines{InnoDB} || $engines{InnoDB} !~ /^(YES|DEFAULT)$/) {
         die install_string('mysql_innodb_disabled');
     }
 

From 397f2140d1c8bc317fca16559afa4b8ba886d612 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@gmail.com>
Date: Mon, 25 Mar 2013 19:54:42 +0100
Subject: [PATCH 070/240] Bug 852943: selectClassification() is no longer used
 r/a=LpSolit

---
 js/productform.js | 69 -----------------------------------------------
 1 file changed, 69 deletions(-)

diff --git a/js/productform.js b/js/productform.js
index 12ad3ea4d..d5e24d306 100644
--- a/js/productform.js
+++ b/js/productform.js
@@ -9,75 +9,6 @@
 // Functions to update form select elements based on a
 // collection of javascript arrays containing strings.
 
-/**
- * Reads the selected classifications and updates product, component,
- * version and milestone lists accordingly.
- *
- * @param  classfield Select element that contains classifications.
- * @param  product    Select element that contains products.
- * @param  component  Select element that contains components. Can be null if
- *                    there is no such element to update.
- * @param  version    Select element that contains versions. Can be null if
- *                    there is no such element to update.
- * @param  milestone  Select element that contains milestones. Can be null if
- *                    there is no such element to update.
- *
- * @global prods      Array of products indexed by classification name.
- * @global first_load Boolean; true if this is the first time this page loads
- *                    or false if not.
- * @global last_sel   Array that contains last list of products so we know what
- *                    has changed, and optimize for additions.
- */
-function selectClassification(classfield, product, component, version, milestone) {
-    // This is to avoid handling events that occur before the form
-    // itself is ready, which could happen in buggy browsers.
-    if (!classfield)
-        return;
-
-    // If this is the first load and nothing is selected, no need to
-    // merge and sort all lists; they are created sorted.
-    if ((first_load) && (classfield.selectedIndex == -1)) {
-        first_load = false;
-        return;
-    }
-    
-    // Don't reset first_load as done in selectProduct. That's because we
-    // want selectProduct to handle the first_load attribute.
-
-    // Stores classifications that are selected.
-    var sel = Array();
-
-    // True if sel array has a full list or false if sel contains only
-    // new classifications that are to be merged to the current list.
-    var merging = false;
-
-    // If nothing selected, pick all.
-    var findall = classfield.selectedIndex == -1;
-    sel = get_selection(classfield, findall, false);
-    if (!findall) {
-        // Save sel for the next invocation of selectClassification().
-        var tmp = sel;
-    
-        // This is an optimization: if we have just added classifications to an
-        // existing selection, no need to clear the form elements and add
-        // everything again; just merge the new ones with the existing
-        // options.
-        if ((last_sel.length > 0) && (last_sel.length < sel.length)) {
-            sel = fake_diff_array(sel, last_sel);
-            merging = true;
-        }
-        last_sel = tmp;
-    }
-
-    // Save original options selected.
-    var saved_prods = get_selection(product, false, true, null);
-
-    // Do the actual fill/update, reselect originally selected options.
-    updateSelect(prods, sel, product, merging, null);
-    restoreSelection(product, saved_prods);
-    selectProduct(product, component, version, milestone, null);
-}
-
 /**
  * Reads the selected products and updates component, version and milestone
  * lists accordingly.

From ed0bea4da77ce03ab4e5bff5ae38d96407f39681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 25 Mar 2013 20:20:58 +0100
Subject: [PATCH 071/240] Bug 854074: Remove all references to the uwinnipeg.ca
 PPM repository as it is no longer available r=glob a=LpSolit

---
 Bugzilla/Install/Requirements.pm         | 10 ----------
 docs/en/xml/installation.xml             | 15 ---------------
 docs/en/xml/modules.xml                  |  6 ++----
 template/en/default/setup/strings.txt.pl |  9 ---------
 4 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index e04701250..66622a7a5 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -569,16 +569,6 @@ sub print_module_instructions {
         ( (!$output and @{$check_results->{missing}})
           or ($output and $check_results->{any_missing}) ) ? 1 : 0;
 
-    # We only print the PPM repository note if we have to.
-    my $perl_ver = sprintf('%vd', $^V);
-    if ($need_module_instructions && ON_ACTIVESTATE && vers_cmp($perl_ver, '5.12') < 0) {
-        my $url_to_theory58S = 'http://cpan.uwinnipeg.ca/PPMPackages/10xx/';
-        print colored(
-            install_string('ppm_repo_add', 
-                           { theory_url => $url_to_theory58S }),
-            COLOR_ERROR);
-    }
-
     if ($need_module_instructions or @{ $check_results->{apache} }) {
         # If any output was required, we want to close the "table"
         print "*" x TABLE_WIDTH . "\n";
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index d26ebbae3..d3ac86ee9 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1588,21 +1588,6 @@ AddType application/rdf+xml .rdf</screen>
 C:\perl&gt; <command>ppm install &lt;module name&gt;</command>
         </programlisting>
 
-        <para>
-          If you are using Perl 5.10.1, the best source for the Windows PPM modules
-          needed for Bugzilla is probably the theory58S website, which you can add
-          to your list of repositories as follows:
-        </para>
-
-        <programlisting>
-<command>ppm repo add theory58S http://cpan.uwinnipeg.ca/PPMPackages/10xx/</command>
-        </programlisting>
-
-        <para>
-          If you are using Perl 5.12 or newer, you no longer need to add
-          this repository. All modules you need are already available from
-	  the ActiveState repository.
-        </para>
         <note>
           <para>
             The PPM repository stores modules in 'packages' that may have
diff --git a/docs/en/xml/modules.xml b/docs/en/xml/modules.xml
index 4ae77e9b6..eba87d41d 100644
--- a/docs/en/xml/modules.xml
+++ b/docs/en/xml/modules.xml
@@ -54,10 +54,8 @@
     <note>
       <para>
         Running Bugzilla on Windows requires the use of ActiveState
-        Perl &min-perl-ver; or higher. Many modules already exist in the core
-        distribution of ActiveState Perl. Additional modules can be downloaded
-        from <ulink url="http://cpan.uwinnipeg.ca/PPMPackages/10xx/" />
-        if you use Perl 5.10.1.
+        Perl &min-perl-ver; or higher. Most modules already exist in the core
+        distribution of ActiveState Perl.
       </para>
     </note>
 
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index f7c4d15cf..f7a7e39f5 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -373,15 +373,6 @@ as well), you should install patchutils from:
 
     http://cyberelk.net/tim/software/patchutils/
 END
-    ppm_repo_add => <<EOT,
-***********************************************************************
-* Note For Windows Users                                              *
-***********************************************************************
-* In order to install the modules listed below, you first have to run * 
-* the following command as an Administrator:                          *
-*                                                                     *
-*   ppm repo add theory58S ##theory_url##
-EOT
     template_precompile   => "Precompiling templates...",
     template_removal_failed => <<END,
 WARNING: The directory '##template_cache##' could not be removed.

From 09a5ee59bdaebca2dd5b7cf66e9002ec63c72d25 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 28 Mar 2013 14:16:58 +0800
Subject: [PATCH 072/240] Bug 850639: Set an upper limit on the number of nodes
 the dependency graph will display r=LpSolit, a=LpSolit

---
 Bugzilla/Constants.pm                           |  4 ++++
 showdependencygraph.cgi                         | 12 +++++++++---
 template/en/default/global/user-error.html.tmpl |  5 +++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 212816a05..765dacd99 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -167,6 +167,7 @@ use Memoize;
     MAX_POSSIBLE_DUPLICATES
     MAX_ATTACH_FILENAME_LENGTH
     MAX_QUIP_LENGTH
+    MAX_WEBDOT_BUGS
 
     PASSWORD_DIGEST_ALGORITHM
     PASSWORD_SALT_LENGTH
@@ -570,6 +571,9 @@ use constant MAX_ATTACH_FILENAME_LENGTH => 255;
 # Maximum length of a quip.
 use constant MAX_QUIP_LENGTH => 512;
 
+# Maximum number of bugs to display in a dependency graph
+use constant MAX_WEBDOT_BUGS => 2000;
+
 # This is the name of the algorithm used to hash passwords before storing
 # them in the database. This can be any string that is valid to pass to
 # Perl's "Digest" module. Note that if you change this, it won't take
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 2f10551a1..838402a8e 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -29,7 +29,7 @@ my $vars = {};
 # performance.
 my $dbh = Bugzilla->switch_to_shadow_db();
 
-local our (%seen, %edgesdone, %bugtitles);
+our (%seen, %edgesdone, %bugtitles, $bug_count);
 
 # CreateImagemap: This sub grabs a local filename as a parameter, reads the 
 # dot-generated image map datafile residing in that file and turns it into
@@ -76,6 +76,7 @@ sub AddLink {
     if (!exists $edgesdone{$key}) {
         $edgesdone{$key} = 1;
         print $fh "$dependson -> $blocked\n";
+        $bug_count++;
         $seen{$blocked} = 1;
         $seen{$dependson} = 1;
     }
@@ -108,10 +109,10 @@ chmod Bugzilla::Install::Filesystem::CGI_WRITE, $filename
 my $urlbase = Bugzilla->params->{'urlbase'};
 
 print $fh "digraph G {";
-print $fh qq{
+print $fh qq(
 graph [URL="${urlbase}query.cgi", rankdir=$rankdir]
 node [URL="${urlbase}show_bug.cgi?id=\\N", style=filled, color=lightgrey]
-};
+);
 
 my %baselist;
 
@@ -224,6 +225,11 @@ foreach my $k (@bug_ids) {
 print $fh "}\n";
 close $fh;
 
+if ($bug_count > MAX_WEBDOT_BUGS) {
+    unlink($filename);
+    ThrowUserError("webdot_too_large");
+}
+
 my $webdotbase = Bugzilla->params->{'webdotbase'};
 
 if ($webdotbase =~ /^https?:/) {
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 6d03eaa4b..58d347376 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1798,6 +1798,11 @@
     Sorry, but you are not allowed to (un)mark comments or attachments
     as private.
 
+  [% ELSIF error == "webdot_too_large" %]
+    [% title = "Dependency Graph Too Large" %]
+    The dependency graph contains too many [% terms.bugs %] to display (more
+    than [% constants.MAX_WEBDOT_BUGS FILTER html %] [%+ terms.bugs %]).
+
   [% ELSIF error == "wrong_token_for_cancelling_email_change" %]
     [% title = "Wrong Token" %]
     That token cannot be used to cancel an email address change.

From 567a68dff4cd725152fc7e6952ceb25fdd6ce557 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 28 Mar 2013 16:05:41 +0800
Subject: [PATCH 073/240] Fix uninitialized warning caused by Bug 850639

---
 showdependencygraph.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 838402a8e..c8b99521c 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -29,7 +29,8 @@ my $vars = {};
 # performance.
 my $dbh = Bugzilla->switch_to_shadow_db();
 
-our (%seen, %edgesdone, %bugtitles, $bug_count);
+our (%seen, %edgesdone, %bugtitles);
+our $bug_count = 0;
 
 # CreateImagemap: This sub grabs a local filename as a parameter, reads the 
 # dot-generated image map datafile residing in that file and turns it into

From 4277bacdaf8d76a580d89f633093b9d20b63cc31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Fri, 5 Apr 2013 21:50:18 +0200
Subject: [PATCH 074/240] Bug 855258: The dependency graph always uses urlbase,
 even when sslbase is in use r=glob a=LpSolit

---
 showdependencygraph.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index c8b99521c..9c45b2586 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -107,7 +107,7 @@ chmod Bugzilla::Install::Filesystem::CGI_WRITE, $filename
     or warn install_string('chmod_failed', { path => $filename,
                                              error => $! });
 
-my $urlbase = Bugzilla->params->{'urlbase'};
+my $urlbase = correct_urlbase();
 
 print $fh "digraph G {";
 print $fh qq(

From fb310e47415e59c94ea2e6c48e02ef6017749fc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Fri, 5 Apr 2013 21:56:38 +0200
Subject: [PATCH 075/240] Bug 857562: ajax_user_autocompletion param ignored on
 Search by People fields r=dkl a=LpSolit

---
 template/en/default/search/form.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 6ced46236..26bf7f06e 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -256,12 +256,12 @@ TUI_hide_default('information_query');
           [% " selected" IF default.emailtype.$n == qv.name %]>[% qv.description %]</option>
       [% END %]
       </select>
-      [% IF feature_enabled('jsonrpc') %]
+      [% IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') %]
         <div id="email[% n %]_autocomplete">
       [% END %]
       <input name="email[% n %]" class="email" id="email[% n %]" 
              value="[% default.email.$n FILTER html %]">
-      [% IF feature_enabled('jsonrpc') %]
+      [% IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') %]
         <div id="email[% n %]_autocomplete_container"></div>
         </div>
         <script type="text/javascript">

From 51fbbb1d68fc41f3df2bee01daece05032b6dafc Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 8 Apr 2013 16:03:09 -0400
Subject: [PATCH 076/240] Bug 148564 - Ability to ignore specific bugs (not get
 email from them, even as the reporter) r=glob,r/a=LpSolit

---
 Bugzilla.pm                                   |  2 +-
 Bugzilla/Bug.pm                               | 43 +++++++++++----
 Bugzilla/BugMail.pm                           | 14 +++--
 Bugzilla/DB/Schema.pm                         | 17 ++++++
 Bugzilla/Flag.pm                              |  3 ++
 Bugzilla/Mailer.pm                            |  2 +
 Bugzilla/User.pm                              | 53 +++++++++++++++++++
 docs/en/xml/using.xml                         |  9 ++++
 process_bug.cgi                               |  4 +-
 .../en/default/account/prefs/email.html.tmpl  | 43 +++++++++++++--
 template/en/default/bug/edit.html.tmpl        | 34 +++++++++---
 userprefs.cgi                                 | 45 +++++++++++++++-
 12 files changed, 241 insertions(+), 28 deletions(-)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 0681b83c7..8f235da21 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -68,7 +68,7 @@ use constant SHUTDOWNHTML_RETRY_AFTER => 3600;
 # Global Code
 #####################################################################
 
-# $::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
+$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
 
 # Note that this is a raw subroutine, not a method, so $class isn't available.
 sub init_page {
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 703ef1bb6..fef7127d7 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -788,8 +788,9 @@ sub run_create_validators {
 
 sub update {
     my $self = shift;
+    my $dbh  = Bugzilla->dbh;
+    my $user = Bugzilla->user;
 
-    my $dbh = Bugzilla->dbh;
     # XXX This is just a temporary hack until all updating happens
     # inside this function.
     my $delta_ts = shift || $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
@@ -880,7 +881,7 @@ sub update {
             
             # Add an activity entry for the other bug.
             LogActivityEntry($removed_id, $other, $self->id, '',
-                             Bugzilla->user->id, $delta_ts);
+                             $user->id, $delta_ts);
             # Update delta_ts on the other bug so that we trigger mid-airs.
             $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
                      undef, $delta_ts, $removed_id);
@@ -891,7 +892,7 @@ sub update {
             
             # Add an activity entry for the other bug.
             LogActivityEntry($added_id, $other, '', $self->id,
-                             Bugzilla->user->id, $delta_ts);
+                             $user->id, $delta_ts);
             # Update delta_ts on the other bug so that we trigger mid-airs.
             $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
                      undef, $delta_ts, $added_id);
@@ -939,7 +940,7 @@ sub update {
         $comment = Bugzilla::Comment->insert_create_data($comment);
         if ($comment->work_time) {
             LogActivityEntry($self->id, "work_time", "", $comment->work_time,
-                Bugzilla->user->id, $delta_ts);
+                             $user->id, $delta_ts);
         }
     }
 
@@ -950,7 +951,7 @@ sub update {
         my ($from, $to) 
             = $comment->is_private ? (0, 1) : (1, 0);
         LogActivityEntry($self->id, "longdescs.isprivate", $from, $to, 
-                         Bugzilla->user->id, $delta_ts, $comment->id);
+                         $user->id, $delta_ts, $comment->id);
     }
 
     # Insert the values into the multiselect value tables
@@ -995,8 +996,8 @@ sub update {
         my $change = $changes->{$field};
         my $from = defined $change->[0] ? $change->[0] : '';
         my $to   = defined $change->[1] ? $change->[1] : '';
-        LogActivityEntry($self->id, $field, $from, $to, Bugzilla->user->id,
-                         $delta_ts);
+        LogActivityEntry($self->id, $field, $from, $to,
+                         $user->id, $delta_ts);
     }
 
     # Check if we have to update the duplicates table and the other bug.
@@ -1010,7 +1011,7 @@ sub update {
                 $update_dup->update();
             }
         }
-        
+
         $changes->{'dup_id'} = [$old_dup || undef, $cur_dup || undef];
     }
 
@@ -1027,6 +1028,25 @@ sub update {
         $self->{delta_ts} = $delta_ts;
     }
 
+    # Update bug ignore data if user wants to ignore mail for this bug
+    if (exists $self->{'bug_ignored'}) {
+        my $bug_ignored_changed;
+        if ($self->{'bug_ignored'} && !$user->is_bug_ignored($self->id)) {
+            $dbh->do('INSERT INTO email_bug_ignore
+                      (user_id, bug_id) VALUES (?, ?)',
+                     undef, $user->id, $self->id);
+            $bug_ignored_changed = 1;
+
+        }
+        elsif (!$self->{'bug_ignored'} && $user->is_bug_ignored($self->id)) {
+            $dbh->do('DELETE FROM email_bug_ignore
+                      WHERE user_id = ? AND bug_id = ?',
+                     undef, $user->id, $self->id);
+            $bug_ignored_changed = 1;
+        }
+        delete $user->{bugs_ignored} if $bug_ignored_changed;
+    }
+
     $dbh->bz_commit_transaction();
 
     # The only problem with this here is that update() is often called
@@ -1044,7 +1064,7 @@ sub update {
 
     # Also flush the visible_bugs cache for this bug as the user's
     # relationship with this bug may have changed.
-    delete Bugzilla->user->{_visible_bugs_cache}->{$self->id};
+    delete $user->{_visible_bugs_cache}->{$self->id};
 
     return $changes;
 }
@@ -2303,7 +2323,7 @@ sub set_all {
     # we have to check that the current assignee, qa, and CCs are still
     # valid if we've switched products, under strict_isolation. We can only
     # do that here, because if they *did* change the assignee, qa, or CC,
-    # then we don't want to check the original ones, only the new ones. 
+    # then we don't want to check the original ones, only the new ones.
     $self->_check_strict_isolation() if $product_changed;
 }
 
@@ -2333,6 +2353,7 @@ sub reset_assigned_to {
     my $comp = $self->component_obj;
     $self->set_assigned_to($comp->default_assignee);
 }
+sub set_bug_ignored       { $_[0]->set('bug_ignored',       $_[1]); }
 sub set_cclist_accessible { $_[0]->set('cclist_accessible', $_[1]); }
 sub set_comment_is_private {
     my ($self, $comment_id, $isprivate) = @_;
@@ -4475,6 +4496,8 @@ sub _multi_select_accessor {
 
 =item set_cclist_accessible
 
+=item set_bug_ignored
+
 =item product
 
 =item VALIDATORS
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 089d3013e..12914ca73 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -212,6 +212,13 @@ sub Send {
         # Deleted users must be excluded.
         next unless $user;
 
+        # If email notifications are disabled for this account, or the bug
+        # is ignored, there is no need to do additional checks.
+        if ($user->email_disabled || $user->is_bug_ignored($id)) {
+            push(@excluded, $user->login);
+            next;
+        }
+
         if ($user->can_see_bug($id)) {
             # Go through each role the user has and see if they want mail in
             # that role.
@@ -228,7 +235,7 @@ sub Send {
                 }
             }
         }
-        
+
         if (scalar(%rels_which_want)) {
             # So the user exists, can see the bug, and wants mail in at least
             # one role. But do we want to send it to them?
@@ -241,9 +248,8 @@ sub Send {
                 $dep_ok = $user->can_see_bug($params->{blocker}->id) ? 1 : 0;
             }
 
-            # Make sure the user isn't in the nomail list, and the dep check passed.
-            if ($user->email_enabled && $dep_ok) {
-                # OK, OK, if we must. Email the user.
+            # Email the user if the dep check passed.
+            if ($dep_ok) {
                 $sent_mail = sendMail(
                     { to       => $user, 
                       bug      => $bug,
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index f92d0aeb7..0d8396df5 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -945,6 +945,23 @@ use constant ABSTRACT_SCHEMA => {
         ],
     },
 
+    email_bug_ignore => {
+        FIELDS => [
+            user_id => {TYPE => 'INT3', NOTNULL => 1,
+                        REFERENCES => {TABLE  => 'profiles',
+                                       COLUMN => 'userid',
+                                       DELETE => 'CASCADE'}},
+            bug_id  => {TYPE => 'INT3', NOTNULL => 1,
+                        REFERENCES => {TABLE  => 'bugs',
+                                       COLUMN => 'bug_id',
+                                       DELETE => 'CASCADE'}},
+        ],
+        INDEXES => [
+            email_bug_ignore_user_id_idx => {FIELDS => [qw(user_id bug_id)],
+                                             TYPE   => 'UNIQUE'},
+        ],
+    },
+
     watch => {
         FIELDS => [
             watcher => {TYPE => 'INT3', NOTNULL => 1,
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 98029a1b1..0ecc545fd 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -997,6 +997,9 @@ sub notify {
     }
 
     foreach my $to (keys %recipients) {
+        # Skip sending if user is ignoring the bug.
+        next if ($recipients{$to} && $recipients{$to}->is_bug_ignored($bug->id));
+
         # Add threadingmarker to allow flag notification emails to be the
         # threaded similar to normal bug change emails.
         my $thread_user_id = $recipients{$to} ? $recipients{$to}->id : 0;
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 6602c6cef..b60ddb72e 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -136,6 +136,8 @@ sub MessageToMTA {
     Bugzilla::Hook::process('mailer_before_send', 
                             { email => $email, mailer_args => \@args });
 
+    return if $email->header('to') eq '';
+
     $email->walk_parts(sub {
         my ($part) = @_;
         return if $part->parts > 1; # Top-level
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 5e39eb49a..6e08ccf0e 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -429,6 +429,31 @@ sub tags {
     return $self->{tags};
 }
 
+sub bugs_ignored {
+    my ($self) = @_;
+    my $dbh = Bugzilla->dbh;
+    if (!defined $self->{'bugs_ignored'}) {
+        $self->{'bugs_ignored'} = $dbh->selectall_arrayref(
+            'SELECT bugs.bug_id AS id,
+                    bugs.bug_status AS status,
+                    bugs.short_desc AS summary
+               FROM bugs
+                    INNER JOIN email_bug_ignore
+                    ON bugs.bug_id = email_bug_ignore.bug_id
+              WHERE user_id = ?',
+            { Slice => {} }, $self->id);
+        # Go ahead and load these into the visible bugs cache
+        # to speed up can_see_bug checks later
+        $self->visible_bugs([ map { $_->{'id'} } @{ $self->{'bugs_ignored'} } ]);
+    }
+    return $self->{'bugs_ignored'};
+}
+
+sub is_bug_ignored {
+    my ($self, $bug_id) = @_;
+    return (grep {$_->{'id'} == $bug_id} @{$self->bugs_ignored}) ? 1 : 0;
+}
+
 ##########################
 # Saved Recent Bug Lists #
 ##########################
@@ -2220,6 +2245,34 @@ groups.
 Returns a hashref with tag IDs as key, and a hashref with tag 'id',
 'name' and 'bug_count' as value.
 
+=item C<bugs_ignored>
+
+Returns an array of hashrefs containing information about bugs currently
+being ignored by the user.
+
+Each hashref contains the following information:
+
+=over
+
+=item C<id>
+
+C<int> The id of the bug.
+
+=item C<status>
+
+C<string> The current status of the bug.
+
+=item C<summary>
+
+C<string> The current summary of the bug.
+
+=back
+
+=item C<is_bug_ignored>
+
+Returns true if the user does not want email notifications for the
+specified bug ID, else returns false.
+
 =back
 
 =head2 Saved Recent Bug Lists
diff --git a/docs/en/xml/using.xml b/docs/en/xml/using.xml
index 88a87f0fc..42f1e4dd9 100644
--- a/docs/en/xml/using.xml
+++ b/docs/en/xml/using.xml
@@ -1420,6 +1420,15 @@
         their <quote>Field/recipient specific options</quote> setting.
       </para>
 
+      <para>
+        The <quote>Ignore Bugs</quote> section lets you specify a
+        comma-separated list of bugs from which you never want to get any
+        email notification of any kind. Removing a bug from this list will
+        re-enable email notification for this bug. This is especially useful
+        e.g. if you are the reporter of a very noisy bug which you are not
+        interested in anymore or if you are watching someone who is in such
+        a noisy bug.
+      </para>
     </section>
 
     <section id="savedsearches" xreflabel="Saved Searches">
diff --git a/process_bug.cgi b/process_bug.cgi
index cf2f31b6f..21113c2e9 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -212,9 +212,9 @@ my @set_fields = qw(op_sys rep_platform priority bug_severity
                     bug_file_loc status_whiteboard short_desc
                     deadline remaining_time estimated_time
                     work_time set_default_assignee set_default_qa_contact
-                    cclist_accessible reporter_accessible 
+                    cclist_accessible reporter_accessible
                     product confirm_product_change
-                    bug_status resolution dup_id);
+                    bug_status resolution dup_id bug_ignored);
 push(@set_fields, 'assigned_to') if !$cgi->param('set_default_assignee');
 push(@set_fields, 'qa_contact')  if !$cgi->param('set_default_qa_contact');
 my %field_translation = (
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 3fcb86176..ef8d0ae29 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -45,7 +45,10 @@
 function SetCheckboxes(setting) {
   for (var count = 0; count < document.userprefsform.elements.length; count++) {
     var theinput = document.userprefsform.elements[count];
-    if (theinput.type == "checkbox" && !theinput.disabled) {
+    if (theinput.type == "checkbox"
+        && !theinput.disabled
+        && !theinput.name.match("remove_ignored_bug"))
+    {
       if (theinput.name.match("neg")) {
         theinput.checked = !setting;
       }
@@ -285,6 +288,40 @@ You are currently not watching any users.
   [% END %]
 </p>
 
-<hr>
+<b>Ignore [% terms.Bugs %]</b>
 
-<br>
+<p>
+  You can specify a list of [% terms.bugs %] from which you never want to get
+  any email notification of any kind by adding their ID(s) as a comma-separated
+  list. Removing [% terms.abug %] by selecting it from the current ignored list 
+  will re-enable email notifications for the [% terms.bug %].
+</p>
+[% IF user.bugs_ignored.size %]
+  <p>
+    You are currently ignoring:
+    <table>
+    [% FOREACH bug = user.bugs_ignored %]
+      <tr>
+        <td>
+          <input type="checkbox" name="remove_ignored_bug_[% bug.id FILTER html %]" value="1">
+        </td>
+        <td><a href="[% urlbase FILTER html %]show_bug.cgi?id=[% bug.id FILTER uri %]">
+          [% bug.id FILTER html %]</a>
+        </td>
+        <td>[% bug.status FILTER html %]</td>
+        <td>
+          [% IF user.can_see_bug(bug.id) %]
+            - [% bug.summary FILTER html %]
+          [% ELSE %]
+            (private)
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+    </table>
+  </p>
+[% END %]
+
+<p>Add [% terms.bugs %]:<br>
+  <input type="text" id="add_ignored_bugs" 
+         name="add_ignored_bugs" size="60"></p>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index c48b17c08..4c39b7cc3 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -92,19 +92,21 @@
         <table cellpadding="3" cellspacing="1">
         [%# *** Reported and modified dates *** %]
          [% PROCESS section_dates %]
-         
+
          [% PROCESS section_cclist %]
-         
+
+         [% PROCESS section_bug_ignored %]
+
          [% PROCESS section_spacer %]
 
          [% PROCESS section_see_also %] 
-         
+
          [% PROCESS section_customfields %]
-         
+
          [% PROCESS section_spacer %]
-         
+
          [% Hook.process("after_custom_fields") %]
-                
+
          [% PROCESS section_flags %]
 
         </table>
@@ -818,6 +820,26 @@
     </tr>
 [% END %]
 
+[%############################################################################%]
+[%# Block for Bug Ignored                                                    #%]
+[%############################################################################%]
+[% BLOCK section_bug_ignored %]
+  [% IF user.id %]
+    <tr>
+      <th class="field_label">
+        <label for="bug_ignored" title="Ignore all email for this [% terms.bug %]">
+          Ignore [% terms.Bug %] Mail:
+        </label>
+      </th>
+      <td>
+        <input type="hidden" name="defined_bug_ignored" value="1">
+        <input type="checkbox" name="bug_ignored" id="bug_ignored" value="1"
+               [% ' checked="checked"' IF user.is_bug_ignored(bug.id) %]>
+      </td>
+    </tr>
+  [% END %]
+[% END %]
+
 [%############################################################################%]
 [%# Block for See Also                                                       #%]
 [%############################################################################%]
diff --git a/userprefs.cgi b/userprefs.cgi
index a80184d51..225a6247e 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -318,6 +318,47 @@ sub SaveEmail {
 
         $dbh->bz_commit_transaction();
     }
+
+    ###########################################################################
+    # Ignore Bugs
+    ###########################################################################
+    my %ignored_bugs = map { $_->{'id'} => 1 } @{$user->bugs_ignored};
+
+    # Validate the new bugs to ignore by checking that they exist and also
+    # if the user gave an alias
+    my @add_ignored = split(/[\s,]+/, $cgi->param('add_ignored_bugs'));
+    @add_ignored = map { Bugzilla::Bug->check($_)->id } @add_ignored;
+    map { $ignored_bugs{$_} = 1 } @add_ignored;
+
+    # Remove any bug ids the user no longer wants to ignore
+    foreach my $key (grep(/^remove_ignored_bug_/, $cgi->params)) {
+        my ($bug_id) = $key =~ /(\d+)$/;
+        delete $ignored_bugs{$bug_id};
+    }
+
+    # Update the database with any changes made
+    my ($removed, $added) = diff_arrays([ map { $_->{'id'} } @{$user->bugs_ignored} ],
+                                        [ keys %ignored_bugs ]);
+
+    if (scalar @$removed || scalar @$added) {
+        $dbh->bz_start_transaction();
+
+        if (scalar @$removed) {
+            $dbh->do('DELETE FROM email_bug_ignore WHERE user_id = ? AND ' . 
+                     $dbh->sql_in('bug_id', $removed),
+                     undef, $user->id);
+        }
+        if (scalar @$added) {
+            my $sth = $dbh->prepare('INSERT INTO email_bug_ignore
+                                     (user_id, bug_id) VALUES (?, ?)');
+            $sth->execute($user->id, $_) foreach @$added;
+        }
+
+        # Reset the cache of ignored bugs if the list changed.
+        delete $user->{bugs_ignored};
+
+        $dbh->bz_commit_transaction();
+    }
 }
 
 
@@ -325,9 +366,9 @@ sub DoPermissions {
     my $dbh = Bugzilla->dbh;
     my $user = Bugzilla->user;
     my (@has_bits, @set_bits);
-    
+
     my $groups = $dbh->selectall_arrayref(
-               "SELECT DISTINCT name, description FROM groups WHERE id IN (" . 
+               "SELECT DISTINCT name, description FROM groups WHERE id IN (" .
                $user->groups_as_string . ") ORDER BY name");
     foreach my $group (@$groups) {
         my ($nam, $desc) = @$group;

From 37de36e4497a0dfd2bf2e7feed554f08fab0cdbf Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 8 Apr 2013 16:08:30 -0400
Subject: [PATCH 077/240] Remove unintentional code commits

---
 Bugzilla.pm        | 2 +-
 Bugzilla/Mailer.pm | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 8f235da21..6331c60fe 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -68,7 +68,7 @@ use constant SHUTDOWNHTML_RETRY_AFTER => 3600;
 # Global Code
 #####################################################################
 
-$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
+#$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
 
 # Note that this is a raw subroutine, not a method, so $class isn't available.
 sub init_page {
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index b60ddb72e..6602c6cef 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -136,8 +136,6 @@ sub MessageToMTA {
     Bugzilla::Hook::process('mailer_before_send', 
                             { email => $email, mailer_args => \@args });
 
-    return if $email->header('to') eq '';
-
     $email->walk_parts(sub {
         my ($part) = @_;
         return if $part->parts > 1; # Top-level

From 6265f14c91bfb8bbbaa5efa4df4d67abbfe675fe Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 8 Apr 2013 17:08:20 -0400
Subject: [PATCH 078/240] Bug 148564 - Ability to ignore specific bugs (not get
 email from them, even as the reporter) - Fix broken use of $cgi->param

---
 userprefs.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/userprefs.cgi b/userprefs.cgi
index 225a6247e..638004c1e 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -331,7 +331,7 @@ sub SaveEmail {
     map { $ignored_bugs{$_} = 1 } @add_ignored;
 
     # Remove any bug ids the user no longer wants to ignore
-    foreach my $key (grep(/^remove_ignored_bug_/, $cgi->params)) {
+    foreach my $key (grep(/^remove_ignored_bug_/, $cgi->param)) {
         my ($bug_id) = $key =~ /(\d+)$/;
         delete $ignored_bugs{$bug_id};
     }

From b6fd85d0fd50815203ae56b6a78bfe77357cf8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 10 Apr 2013 22:57:33 +0200
Subject: [PATCH 079/240] Bug 860140: Remove the obsolete <blink> HTML element
 r=sgreen a=LpSolit

---
 template/en/default/admin/components/confirm-delete.html.tmpl | 2 +-
 template/en/default/admin/milestones/confirm-delete.html.tmpl | 2 +-
 template/en/default/admin/params/common.html.tmpl             | 2 +-
 template/en/default/admin/products/confirm-delete.html.tmpl   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl
index d85e17c12..82bf018b3 100644
--- a/template/en/default/admin/components/confirm-delete.html.tmpl
+++ b/template/en/default/admin/components/confirm-delete.html.tmpl
@@ -122,7 +122,7 @@ from '[% product.name FILTER html %]' product
         is 1 [% terms.bug %]
       [% END %]
       entered for this component!  When you delete this
-      component, <b><blink>ALL</blink></b> stored [% terms.bugs %] and
+      component, <b>ALL</b> stored [% terms.bugs %] and
       their history will be deleted too.
       </td></tr></table>
 
diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl
index d0b69b8ac..cc30f164f 100644
--- a/template/en/default/admin/milestones/confirm-delete.html.tmpl
+++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl
@@ -62,7 +62,7 @@
       is 1 [% terms.bug %]
     [% END %]
     entered for this milestone! When you delete this milestone,
-    <b><blink>ALL</blink></b> of these [% terms.bugs %] will be retargeted
+    <b>ALL</b> of these [% terms.bugs %] will be retargeted
     to [% product.default_milestone FILTER html %], the default milestone for 
     the [% product.name FILTER html %] product.
   </p>
diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl
index c9744f45c..bf2675b16 100644
--- a/template/en/default/admin/params/common.html.tmpl
+++ b/template/en/default/admin/params/common.html.tmpl
@@ -108,7 +108,7 @@
         </select>
       [% ELSE %]
         <font color="red">
-          <blink>Unknown param type [% param.type FILTER html %]!!!</blink>
+          Unknown param type [% param.type FILTER html %]!!!
         </font>
       [% END %]  
       </p>
diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl
index 324d21308..2198066b8 100644
--- a/template/en/default/admin/products/confirm-delete.html.tmpl
+++ b/template/en/default/admin/products/confirm-delete.html.tmpl
@@ -224,7 +224,7 @@
             is 1 [% terms.bug %]
           [% END %]
           entered for this product!  When you delete this
-          product, <b><blink>ALL</blink></b> stored [% terms.bugs %] and
+          product, <b>ALL</b> stored [% terms.bugs %] and
           their history will be deleted, too.
         </td>
       </tr>

From 3b95666ed310002f164557b439ef191da4b8825c Mon Sep 17 00:00:00 2001
From: Pami Ketolainen <pami.ketolainen@gmail.com>
Date: Thu, 11 Apr 2013 15:16:20 +0200
Subject: [PATCH 080/240] Bug 860723: Custom fields are shown twice in report
 axis selectors r/a=LpSolit

---
 query.cgi                                                 | 7 -------
 template/en/default/search/search-report-select.html.tmpl | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/query.cgi b/query.cgi
index 9c53e2151..0e921ac0c 100755
--- a/query.cgi
+++ b/query.cgi
@@ -261,13 +261,6 @@ if (($cgi->param('query_format') || $cgi->param('format') || "")
     $vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
 }
 
-if ($cgi->param('format') && $cgi->param('format') =~ /^report-(table|graph)$/) {
-    # Get legal custom fields for tabular and graphical reports.
-    my @custom_fields_for_reports =
-      grep { $_->type == FIELD_TYPE_SINGLE_SELECT } Bugzilla->active_custom_fields;
-    $vars->{'custom_fields'} = \@custom_fields_for_reports;
-}
-
 $vars->{'known_name'} = $cgi->param('known_name');
 $vars->{'columnlist'} = $cgi->param('columnlist');
 
diff --git a/template/en/default/search/search-report-select.html.tmpl b/template/en/default/search/search-report-select.html.tmpl
index d806e2d03..93b4c44f8 100644
--- a/template/en/default/search/search-report-select.html.tmpl
+++ b/template/en/default/search/search-report-select.html.tmpl
@@ -25,12 +25,5 @@
         [% " selected" IF default.$name.0 == field %]>
         [% field_descs.$field || field FILTER html %]</option>
     [% END %]
-
-    [%# Single-select fields are also valid column names. %]
-    [% FOREACH field = custom_fields %]
-      <option value="[% field.name FILTER html %]"
-        [% " selected" IF default.$name.0 == field.name %]>
-        [% field.description FILTER html %]</option>
-    [% END %]
   </select>
 [% END %]

From 2b096b7dbd06f6c871d8411904d8110309fec11c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Fri, 12 Apr 2013 23:29:58 +0200
Subject: [PATCH 081/240] Bug 861392: Be more descriptive about "Ignore Bug
 Email" r=dkl a=LpSolit

---
 template/en/default/bug/edit.html.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 4c39b7cc3..8d3d76306 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -835,6 +835,7 @@
         <input type="hidden" name="defined_bug_ignored" value="1">
         <input type="checkbox" name="bug_ignored" id="bug_ignored" value="1"
                [% ' checked="checked"' IF user.is_bug_ignored(bug.id) %]>
+        (never email me about this [% terms.bug %])
       </td>
     </tr>
   [% END %]

From ab8f22d24f98bb214b36347314237a44d5a05522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 15 Apr 2013 23:25:08 +0200
Subject: [PATCH 082/240] Bug 861528: $user->can_enter_product() now returns
 the product object instead of 1 r=glob a=LpSolit

---
 Bugzilla/User.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 6e08ccf0e..943ec7247 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -2513,7 +2513,8 @@ the database again. Used mostly by L<Bugzilla::Product>.
 
 =item C<can_enter_product($product_name, $warn)>
 
- Description: Returns 1 if the user can enter bugs into the specified product.
+ Description: Returns a product object if the user can enter bugs into the
+              specified product.
               If the user cannot enter bugs into the product, the behavior of
               this method depends on the value of $warn:
               - if $warn is false (or not given), a 'false' value is returned;
@@ -2524,7 +2525,7 @@ the database again. Used mostly by L<Bugzilla::Product>.
                               must be thrown if the user cannot enter bugs
                               into the specified product.
 
- Returns:     1 if the user can enter bugs into the product,
+ Returns:     A product object if the user can enter bugs into the product,
               0 if the user cannot enter bugs into the product and if $warn
               is false (an error is thrown if $warn is true).
 

From cab0891ce75362fbf3d9f496957d3e6e1ec686b6 Mon Sep 17 00:00:00 2001
From: Pami Ketolainen <pami.ketolainen@jollamobile.com>
Date: Tue, 16 Apr 2013 12:12:15 +0200
Subject: [PATCH 083/240] Bug 782210: If a custom field depends on a product,
 component or classification, the "mandatory" bit is ignored on bug creation
 r/a=LpSolit

---
 Bugzilla/Bug.pm                   | 20 ++++++++++++--------
 Bugzilla/Field/ChoiceInterface.pm |  1 +
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index fef7127d7..576ce9d52 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -747,6 +747,17 @@ sub run_create_validators {
     my $class  = shift;
     my $params = $class->SUPER::run_create_validators(@_);
 
+    # Add classification for checking mandatory fields which depend on it
+    $params->{classification} = $params->{product}->classification->name;
+
+    my @mandatory_fields = @{ Bugzilla->fields({ is_mandatory => 1,
+                                                 enter_bug    => 1,
+                                                 obsolete     => 0 }) };
+    foreach my $field (@mandatory_fields) {
+        $class->_check_field_is_mandatory($params->{$field->name}, $field,
+                                          $params);
+    }
+
     my $product = delete $params->{product};
     $params->{product_id} = $product->id;
     my $component = delete $params->{component};
@@ -766,18 +777,11 @@ sub run_create_validators {
     # You can't set these fields.
     delete $params->{lastdiffed};
     delete $params->{bug_id};
+    delete $params->{classification};
 
     Bugzilla::Hook::process('bug_end_of_create_validators',
                             { params => $params });
 
-    my @mandatory_fields = @{ Bugzilla->fields({ is_mandatory => 1,
-                                                 enter_bug    => 1,
-                                                 obsolete     => 0 }) };
-    foreach my $field (@mandatory_fields) {
-        $class->_check_field_is_mandatory($params->{$field->name}, $field,
-                                          $params);
-    }
-
     # And this is not a valid DB field, it's just used as part of 
     # _check_dependencies to avoid running it twice for both blocked 
     # and dependson.
diff --git a/Bugzilla/Field/ChoiceInterface.pm b/Bugzilla/Field/ChoiceInterface.pm
index 24bd57dc9..f7f5e3b73 100644
--- a/Bugzilla/Field/ChoiceInterface.pm
+++ b/Bugzilla/Field/ChoiceInterface.pm
@@ -171,6 +171,7 @@ sub is_set_on_bug {
     # This allows bug/create/create.html.tmpl to pass in a hashref that 
     # looks like a bug object.
     my $value = blessed($bug) ? $bug->$field_name : $bug->{$field_name};
+    $value = $value->name if blessed($value);
     return 0 if !defined $value;
 
     if ($self->field->type == FIELD_TYPE_BUG_URLS

From 076de9edcd5629ad093a973e15780d093d7b2e42 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 18 Apr 2013 01:15:46 +0800
Subject: [PATCH 084/240] Bug 828344: Make "contains all of the words" look for
 all words within the same comment or flag r=LpSolit, a=LpSolit

---
 Bugzilla/Search.pm             | 148 ++++++++++++++++++++++++++-------
 Bugzilla/Search/Clause.pm      |  36 ++++----
 Bugzilla/Search/Quicksearch.pm |   4 +-
 3 files changed, 138 insertions(+), 50 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 658b85f99..51520bb55 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -268,12 +268,14 @@ use constant OPERATOR_FIELD_OVERRIDE => {
     },
     dependson        => MULTI_SELECT_OVERRIDE,
     keywords         => MULTI_SELECT_OVERRIDE,
-    'flagtypes.name' => MULTI_SELECT_OVERRIDE,
+    'flagtypes.name' => {
+        _non_changed => \&_flagtypes_nonchanged,
+    },
     longdesc => {
-        %{ MULTI_SELECT_OVERRIDE() },
         changedby     => \&_long_desc_changedby,
         changedbefore => \&_long_desc_changedbefore_after,
         changedafter  => \&_long_desc_changedbefore_after,
+        _non_changed  => \&_long_desc_nonchanged,
     },
     'longdescs.count' => {
         changedby     => \&_long_desc_changedby,
@@ -767,8 +769,16 @@ sub _sql {
     my ($self) = @_;
     return $self->{sql} if $self->{sql};
     my $dbh = Bugzilla->dbh;
-    
+
     my ($joins, $clause) = $self->_charts_to_conditions();
+
+    if (!$clause->as_string
+        && !Bugzilla->params->{'search_allow_no_criteria'}
+        && !$self->{allow_unlimited})
+    {
+        ThrowUserError('buglist_parameters_required');
+    }
+
     my $select = join(', ', $self->_sql_select);
     my $from = $self->_sql_from($joins);
     my $where = $self->_sql_where($clause);
@@ -1308,14 +1318,7 @@ sub _sql_where {
     # SQL a bit more readable for debugging.
     my $where = join("\n   AND ", $self->_standard_where);
     my $clause_sql = $main_clause->as_string;
-    if ($clause_sql) {
-        $where .= "\n   AND " . $clause_sql;
-    }
-    elsif (!Bugzilla->params->{'search_allow_no_criteria'}
-           && !$self->{allow_unlimited})
-    {
-        ThrowUserError('buglist_parameters_required');
-    }
+    $where .= "\n   AND " . $clause_sql if $clause_sql;
     return $where;
 }
 
@@ -1994,24 +1997,13 @@ sub _quote_unless_numeric {
 
 sub build_subselect {
     my ($outer, $inner, $table, $cond, $negate) = @_;
-
-    if ($table eq 'longdescs') {
-        # There is no index on the longdescs.thetext column and so it takes
-        # a long time to scan the whole table unconditionally. For this table,
-        # we return the subselect and let the DB optimizer restrict the search
-        # to some given bug list only based on other search criteria available.
-        my $not = $negate ? "NOT" : "";
-        return "$outer $not IN (SELECT DISTINCT $inner FROM $table WHERE $cond)";
-    }
-    else {
-        # Execute subselects immediately to avoid dependent subqueries, which are
-        # large performance hits on MySql
-        my $q = "SELECT DISTINCT $inner FROM $table WHERE $cond";
-        my $dbh = Bugzilla->dbh;
-        my $list = $dbh->selectcol_arrayref($q);
-        return $negate ? "1=1" : "1=2" unless @$list;
-        return $dbh->sql_in($outer, $list, $negate);
-    }
+    # Execute subselects immediately to avoid dependent subqueries, which are
+    # large performance hits on MySql
+    my $q = "SELECT DISTINCT $inner FROM $table WHERE $cond";
+    my $dbh = Bugzilla->dbh;
+    my $list = $dbh->selectcol_arrayref($q);
+    return $negate ? "1=1" : "1=2" unless @$list;
+    return $dbh->sql_in($outer, $list, $negate);
 }
 
 # Used by anyexact to get the list of input values. This allows us to
@@ -2432,14 +2424,51 @@ sub _long_desc_changedbefore_after {
     }
 }
 
+sub _long_desc_nonchanged {
+    my ($self, $args) = @_;
+    my ($chart_id, $operator, $value, $joins, $bugs_table) =
+        @$args{qw(chart_id operator value joins bugs_table)};
+    my $dbh = Bugzilla->dbh;
+
+    my $table = "longdescs_$chart_id";
+    my $join_args = {
+        chart_id   => $chart_id,
+        sequence   => $chart_id,
+        field      => 'longdesc',
+        full_field => "$table.thetext",
+        operator   => $operator,
+        value      => $value,
+        all_values => $value,
+        quoted     => $dbh->quote($value),
+        joins      => [],
+        bugs_table => $bugs_table,
+    };
+    $self->_do_operator_function($join_args);
+
+    # If the user is not part of the insiders group, they cannot see
+    # private comments
+    if (!$self->_user->is_insider) {
+        $join_args->{term} .= " AND $table.isprivate = 0";
+    }
+
+    my $join = {
+        table => 'longdescs',
+        as    => $table,
+        extra => [ $join_args->{term} ],
+    };
+    push(@$joins, $join);
+
+    $args->{term} =  "$table.comment_id IS NOT NULL";
+}
+
 sub _content_matches {
     my ($self, $args) = @_;
     my ($chart_id, $joins, $fields, $operator, $value) =
         @$args{qw(chart_id joins fields operator value)};
     my $dbh = Bugzilla->dbh;
-    
+
     # "content" is an alias for columns containing text for which we
-    # can search a full-text index and retrieve results by relevance, 
+    # can search a full-text index and retrieve results by relevance,
     # currently just bug comments (and summaries to some degree).
     # There's only one way to search a full-text index, so we only
     # accept the "matches" operator, which is specific to full-text
@@ -2694,6 +2723,63 @@ sub _multiselect_multiple {
     }
 }
 
+sub _flagtypes_nonchanged {
+    my ($self, $args) = @_;
+    my ($chart_id, $operator, $value, $joins, $bugs_table) =
+        @$args{qw(chart_id operator value joins bugs_table)};
+    my $dbh = Bugzilla->dbh;
+    my $join;
+
+    # join to the attachments table
+    my $attach_table = "attachments_$chart_id";
+    $join = {
+        table => 'attachments',
+        as    => $attach_table,
+        from  => "$bugs_table.bug_id",
+        to    => "bug_id",
+        extra => [ ($self->_user->is_insider ? '' : "$attach_table.isprivate = 0") ],
+    };
+    push(@$joins, $join);
+
+    # join to the flags table
+    my $flags_table = "flags_$chart_id";
+    $join = {
+        table => 'flags',
+        as    => $flags_table,
+        from  => "$bugs_table.bug_id",
+        to    => "bug_id",
+        extra => [ "($flags_table.attach_id = $attach_table.attach_id " .
+                " OR $flags_table.attach_id IS NULL)" ],
+    };
+    push(@$joins, $join);
+
+    # join to the flagtypes table
+    my $flagtypes_table = "flagtypes_$chart_id";
+    $join = {
+        table => 'flagtypes',
+        as    => $flagtypes_table,
+        from  => "$flags_table.type_id",
+        to    => "id",
+    };
+    push(@$joins, $join);
+
+    # join to the profiles table for the requestee
+    my $flag_profile_table = "flag_profiles_$chart_id";
+    $join = {
+        table => 'profiles',
+        as    => $flag_profile_table,
+        from  => "$flags_table.requestee_id",
+        to    => "userid",
+    };
+    push(@$joins, $join);
+
+    $args->{full_field} = $dbh->sql_string_concat("$flagtypes_table.name",
+                                                  "$flags_table.status",
+                                                  "COALESCE($flag_profile_table.login_name, '')");
+
+    $self->_do_operator_function($args);
+}
+
 sub _multiselect_nonchanged {
     my ($self, $args) = @_;
     my ($chart_id, $joins, $field, $operator) =
diff --git a/Bugzilla/Search/Clause.pm b/Bugzilla/Search/Clause.pm
index 7bfd52015..9d3d690a3 100644
--- a/Bugzilla/Search/Clause.pm
+++ b/Bugzilla/Search/Clause.pm
@@ -86,25 +86,29 @@ sub walk_conditions {
 
 sub as_string {
     my ($self) = @_;
-    my @strings;
-    foreach my $child (@{ $self->children }) {
-        next if $child->isa(__PACKAGE__) && !$child->has_translated_conditions;
-        next if $child->isa('Bugzilla::Search::Condition')
-                && !$child->translated;
+    if (!$self->{sql}) {
+        my @strings;
+        foreach my $child (@{ $self->children }) {
+            next if $child->isa(__PACKAGE__) && !$child->has_translated_conditions;
+            next if $child->isa('Bugzilla::Search::Condition')
+                    && !$child->translated;
 
-        my $string = $child->as_string;
-        if ($self->joiner eq 'AND') {
-            $string = "( $string )" if $string =~ /OR/;
+            my $string = $child->as_string;
+            next unless $string;
+            if ($self->joiner eq 'AND') {
+                $string = "( $string )" if $string =~ /OR/;
+            }
+            else {
+                $string = "( $string )" if $string =~ /AND/;
+            }
+            push(@strings, $string);
         }
-        else {
-            $string = "( $string )" if $string =~ /AND/;
-        }
-        push(@strings, $string);
+
+        my $sql = join(' ' . $self->joiner . ' ', @strings);
+        $sql = "NOT( $sql )" if $sql && $self->negate;
+        $self->{sql} = $sql;
     }
-    
-    my $sql = join(' ' . $self->joiner . ' ', @strings);
-    $sql = "NOT( $sql )" if $sql && $self->negate;
-    return $sql;
+    return $self->{sql};
 }
 
 # Search.pm converts URL parameters to Clause objects. This helps do the
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index fc109a640..d073720a1 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -364,10 +364,8 @@ sub _handle_field_names {
     my ($or_operand, $negate, $unknownFields, $ambiguous_fields) = @_;
 
     # Flag and requestee shortcut
-    if ($or_operand =~ /^(?:flag:)?([^\?]+\?)([^\?]*)$/) {
+    if ($or_operand =~ /^(?:flag:)?([^\?]+\?[^\?]*)$/) {
         addChart('flagtypes.name', 'substring', $1, $negate);
-        $chart++; $and = $or = 0; # Next chart for boolean AND
-        addChart('requestees.login_name', 'substring', $2, $negate);
         return 1;
     }
 

From 05baf02b728cdb247e6a295fbb34b8a918d30ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 18 Apr 2013 01:23:30 +0200
Subject: [PATCH 085/240] Bug 858911: Oracle fails with "ORA-04043: object
 T_GROUP_CONCAT does not exist" when installing Bugzilla for the first time
 r=dkl a=LpSolit

---
 Bugzilla/DB/Oracle.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index a4276ab7a..e9ee44f5e 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -531,7 +531,9 @@ sub bz_setup_database {
               . " RETURN NUMBER IS BEGIN RETURN LENGTH(COLUMN_NAME); END;");
     
     # Create types for group_concat
-    $self->do("DROP TYPE T_GROUP_CONCAT");
+    my $type_exists = $self->selectrow_array("SELECT 1 FROM user_types
+                                              WHERE type_name = 'T_GROUP_CONCAT'");
+    $self->do("DROP TYPE T_GROUP_CONCAT") if $type_exists;
     $self->do("CREATE OR REPLACE TYPE T_CLOB_DELIM AS OBJECT "
           . "( p_CONTENT CLOB, p_DELIMITER VARCHAR2(256)"
           . ", MAP MEMBER FUNCTION T_CLOB_DELIM_ToVarchar return VARCHAR2"

From 5c1392746b3e6dd99c0b8e3e33c6e92fe3253c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 18 Apr 2013 01:28:55 +0200
Subject: [PATCH 086/240] Bug 851591: Add a main-end hook into
 global/footer.html.tmpl to be able to display additional data before
 displaying the page footer r=dkl a=LpSolit

---
 .../en/default/hook/global/footer-end.html.tmpl  | 16 ++++++++++++++++
 template/en/default/global/footer.html.tmpl      |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 extensions/Example/template/en/default/hook/global/footer-end.html.tmpl

diff --git a/extensions/Example/template/en/default/hook/global/footer-end.html.tmpl b/extensions/Example/template/en/default/hook/global/footer-end.html.tmpl
new file mode 100644
index 000000000..f4cb1e006
--- /dev/null
+++ b/extensions/Example/template/en/default/hook/global/footer-end.html.tmpl
@@ -0,0 +1,16 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% USE date %]
+
+<p align="center">
+  <em>[% component.callers.first FILTER html %]</em> processed
+  on [% date.format(date.now, '%b %d, %Y at %H:%M:%S') FILTER html %].
+  <br>
+  (provided by the Example extension).
+</p>
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index 0e98d9efc..e161a061c 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -11,6 +11,7 @@
   # global/useful-links.html.tmpl.
   #%]
 
+  [% Hook.process('main-end') %]
 </div>
 
 [%# Migration note: below this point, this file corresponds to the old Param

From 36ee6ccd6bf74c15c4679bb1b82cb06017f7912e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sun, 28 Apr 2013 13:36:51 +0200
Subject: [PATCH 087/240] Bug 858909: When running checksetup.pl for the first
 time using Oracle as DB server, you get an "uninitialized value" warning
 r=dkl a=LpSolit

---
 Bugzilla/DB/Oracle.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index e9ee44f5e..68aa3fa93 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -60,7 +60,7 @@ sub new {
     my $dsn = "dbi:Oracle:host=$host;sid=$dbname";
     $dsn .= ";port=$port" if $port;
     my $attrs = { FetchHashKeyName => 'NAME_lc',  
-                  LongReadLen => max(Bugzilla->params->{'maxattachmentsize'},
+                  LongReadLen => max(Bugzilla->params->{'maxattachmentsize'} || 0,
                                      MIN_LONG_READ_LEN) * 1024,
                 };
     my $self = $class->db_new({ dsn => $dsn, user => $user, 

From 2ad2810b2bda7c664bb6a8c8b50c17958aed1f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sun, 28 Apr 2013 13:43:40 +0200
Subject: [PATCH 088/240] Bug 861519: The keyword field in the "Enter Bug" page
 no longer lists available keywords r=glob a=LpSolit

---
 template/en/default/bug/create/create.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 382e704b7..a2109c956 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -600,8 +600,8 @@ TUI_hide_default('attachment_text_field');
       <tr>
         [% INCLUDE bug/field.html.tmpl
            bug = default, field = bug_fields.keywords, editable = 1,
-           value = keywords, desc_url = "describekeywords.cgi",
-           value_span = 2
+           value = keywords, possible_values = all_keywords,
+           desc_url = "describekeywords.cgi", value_span = 2
         %]
       </tr>
     [% END %]

From b0f1074c262d9514f76ea843472fb741da08a87f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sun, 28 Apr 2013 13:48:58 +0200
Subject: [PATCH 089/240] Bug 848635: Old queries based on tags are no longer
 listed in the page footer by default when upgrading from 4.0 or older to 4.2
 r=glob a=LpSolit

---
 Bugzilla/Install/DB.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 3170babf6..a45c5a5ea 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -3581,9 +3581,6 @@ sub _migrate_user_tags {
                                      VALUES (?, ?)');
     my $sth_nq = $dbh->prepare('UPDATE namedqueries SET query = ?
                                 WHERE id = ?');
-    my $sth_nq_footer = $dbh->prepare(
-        'DELETE FROM namedqueries_link_in_footer 
-               WHERE user_id = ? AND namedquery_id = ?');
 
     if (scalar @$tags) {
         print install_string('update_queries_to_tags'), "\n";
@@ -3623,13 +3620,11 @@ sub _migrate_user_tags {
             next if !$bug_id;
             $sth_bug_tag->execute($bug_id, $tag_id);
         }
-        
+
         # Existing tags may be used in whines, or shared with
         # other users. So we convert them rather than delete them.
         $uri->query_param('tag', $tag_name);
         $sth_nq->execute($uri->query, $query_id);
-        # But we don't keep showing them in the footer.
-        $sth_nq_footer->execute($user_id, $query_id);
     }
 
     $dbh->bz_commit_transaction();

From b7bc044ac9559d063d67ddfc4cae95f47876e6c6 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 3 May 2013 18:20:52 -0400
Subject: [PATCH 090/240] Bug 859118 - Bug.search called with no arguments
 returns all visible bugs, ignoring max_search_results and
 search_allow_no_criteria r/a=LpSolit

---
 Bugzilla/WebService/Bug.pm       | 56 +++++++++++++++++++++++++-------
 Bugzilla/WebService/Constants.pm |  3 ++
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index fe102f70d..ff6a85582 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -406,14 +406,25 @@ sub history {
 
 sub search {
     my ($self, $params) = @_;
-   
+
     Bugzilla->switch_to_shadow_db();
 
     if ( defined($params->{offset}) and !defined($params->{limit}) ) {
         ThrowCodeError('param_required', 
                        { param => 'limit', function => 'Bug.search()' });
     }
-    
+
+    my $max_results = Bugzilla->params->{max_search_results};
+    unless (defined $params->{limit} && $params->{limit} == 0) {
+        if (!defined $params->{limit} || $params->{limit} > $max_results) {
+            $params->{limit} = $max_results;
+        }
+    }
+    else {
+        delete $params->{limit};
+        delete $params->{offset};
+    }
+
     $params = Bugzilla::Bug::map_fields($params);
     delete $params->{WHERE};
 
@@ -440,7 +451,17 @@ sub search {
         my $clause = join(' OR ', @likes);
         $params->{WHERE}->{"($clause)"} = [map { "\%$_\%" } @strings];
     }
-   
+
+    # If no other parameters have been passed other than limit and offset
+    # and a WHERE parameter was not created earlier, then we throw error
+    # if system is configured to do so.
+    if (!$params->{WHERE} 
+        && !grep(!/(limit|offset)/i, keys %$params)
+        && !Bugzilla->params->{search_allow_no_criteria})
+    {
+        ThrowUserError('buglist_parameters_required');
+    }
+
     # We want include_fields and exclude_fields to be passed to
     # _bug_to_hash but not to Bugzilla::Bug->match so we copy the 
     # params and delete those before passing to Bugzilla::Bug->match.
@@ -2257,13 +2278,16 @@ May not be an array.
 
 =item C<limit>
 
-C<int> Limit the number of results returned to C<int> records.
+C<int> Limit the number of results returned to C<int> records. If the limit
+is more than zero and higher than the maximum limit set by the administrator,
+then the maximum limit will be used instead. If you set the limit equal to zero,
+then all matching results will be returned instead.
 
 =item C<offset>
 
-C<int> Used in conjunction with the C<limit> argument, C<offset> defines 
-the starting position for the search. For example, given a search that 
-would return 100 bugs, setting C<limit> to 10 and C<offset> to 10 would return 
+C<int> Used in conjunction with the C<limit> argument, C<offset> defines
+the starting position for the search. For example, given a search that
+would return 100 bugs, setting C<limit> to 10 and C<offset> to 10 would return
 bugs 11 through 20 from the set of 100.
 
 =item C<op_sys>
@@ -2349,10 +2373,16 @@ log in and I<then> call this method.
 
 =item B<Errors>
 
-Currently, this function doesn't throw any special errors (other than
-the ones that all webservice functions can throw). If you specify
-an invalid value for a particular field, you just won't get any results
-for that value.
+If you specify an invalid value for a particular field, you just won't
+get any results for that value.
+
+=over
+
+=item 1000 (Parameters Required)
+
+You may not search without any search terms.
+
+=back
 
 =item B<History>
 
@@ -2365,6 +2395,10 @@ for that value.
 =item The C<reporter> input parameter was renamed to C<creator>
 in Bugzilla B<4.0>.
 
+=item In B<4.2.6> and newer, added the ability to return all results if
+C<limit> is set equal to zero. Otherwise maximum results returned are limited
+by system configuration.
+
 =back
 
 =back
diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm
index 624ab6e09..b1503772e 100644
--- a/Bugzilla/WebService/Constants.pm
+++ b/Bugzilla/WebService/Constants.pm
@@ -163,6 +163,9 @@ use constant WS_ERROR_CODE => {
     # Classification errors are 900-1000
     auth_classification_not_enabled => 900,
 
+    # Search errors are 1000-1100
+    buglist_parameters_required => 1000,
+
     # Errors thrown by the WebService itself. The ones that are negative 
     # conform to http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
     xmlrpc_invalid_value => -32600,

From 4324bacf96e1c9d76a42f9cdf5c9a86a287ee5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sun, 5 May 2013 23:32:24 +0200
Subject: [PATCH 091/240] Bug 212471: Tabular reports do not link bug counts
 involving the empty resolution correctly r=dkl a=LpSolit

---
 report.cgi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/report.cgi b/report.cgi
index 5e51bd34a..3a1130f2d 100755
--- a/report.cgi
+++ b/report.cgi
@@ -352,7 +352,7 @@ sub get_names {
         foreach my $value (@{$field->legal_values}) {
             push(@sorted, $value->name) if $names->{$value->name};
         }
-        unshift(@sorted, ' ') if $field_name eq 'resolution';
+        unshift(@sorted, '---') if $field_name eq 'resolution';
         @sorted = uniq @sorted;
     }  
     elsif ($isnumeric) {
@@ -381,6 +381,7 @@ sub check_value {
     else {
         $value = shift @$result;
         $value = ' ' if (!defined $value || $value eq '');
+        $value = '---' if ($field eq 'resolution' && $value eq ' ');
     }
     return $value;
 }

From ad651b8f322c52bb7c5eea7dac271b569057e17f Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 10 May 2013 16:18:12 +0800
Subject: [PATCH 092/240] Bug 828344: "contains all of the words" no longer
 looks for all words within the same comment or flag r=LpSolit, a=LpSolit

---
 Bugzilla/Search.pm             | 90 ++++++++++++++++------------------
 Bugzilla/Search/Condition.pm   |  9 +++-
 Bugzilla/Search/Quicksearch.pm | 11 ++++-
 3 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 51520bb55..a91a25b06 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1817,6 +1817,7 @@ sub _handle_chart {
         joins        => [],
         bugs_table   => 'bugs',
         table_suffix => '',
+        condition    => $condition,
     );
     $clause->update_search_args(\%search_args);
 
@@ -2725,59 +2726,50 @@ sub _multiselect_multiple {
 
 sub _flagtypes_nonchanged {
     my ($self, $args) = @_;
-    my ($chart_id, $operator, $value, $joins, $bugs_table) =
-        @$args{qw(chart_id operator value joins bugs_table)};
+    my ($chart_id, $operator, $value, $joins, $bugs_table, $condition) =
+        @$args{qw(chart_id operator value joins bugs_table condition)};
     my $dbh = Bugzilla->dbh;
-    my $join;
 
-    # join to the attachments table
-    my $attach_table = "attachments_$chart_id";
-    $join = {
-        table => 'attachments',
-        as    => $attach_table,
-        from  => "$bugs_table.bug_id",
-        to    => "bug_id",
-        extra => [ ($self->_user->is_insider ? '' : "$attach_table.isprivate = 0") ],
+    # For 'not' operators, we need to negate the whole term.
+    # If you search for "Flags" (does not contain) "approval+" we actually want
+    # to return *bugs* that don't contain an approval+ flag.  Without rewriting
+    # the negation we'll search for *flags* which don't contain approval+.
+    if ($operator =~ s/^not//) {
+        $args->{operator} = $operator;
+        $condition->operator($operator);
+        $condition->negate(1);
+    }
+
+    my $subselect_args = {
+        chart_id   => $chart_id,
+        sequence   => $chart_id,
+        field      => 'flagtypes.name',
+        full_field =>  $dbh->sql_string_concat("flagtypes_$chart_id.name", "flags_$chart_id.status"),
+        operator   => $operator,
+        value      => $value,
+        all_values => $value,
+        quoted     => $dbh->quote($value),
+        joins      => [],
+        bugs_table => "bugs_$chart_id",
     };
-    push(@$joins, $join);
+    $self->_do_operator_function($subselect_args);
+    my $subselect_term = $subselect_args->{term};
 
-    # join to the flags table
-    my $flags_table = "flags_$chart_id";
-    $join = {
-        table => 'flags',
-        as    => $flags_table,
-        from  => "$bugs_table.bug_id",
-        to    => "bug_id",
-        extra => [ "($flags_table.attach_id = $attach_table.attach_id " .
-                " OR $flags_table.attach_id IS NULL)" ],
-    };
-    push(@$joins, $join);
-
-    # join to the flagtypes table
-    my $flagtypes_table = "flagtypes_$chart_id";
-    $join = {
-        table => 'flagtypes',
-        as    => $flagtypes_table,
-        from  => "$flags_table.type_id",
-        to    => "id",
-    };
-    push(@$joins, $join);
-
-    # join to the profiles table for the requestee
-    my $flag_profile_table = "flag_profiles_$chart_id";
-    $join = {
-        table => 'profiles',
-        as    => $flag_profile_table,
-        from  => "$flags_table.requestee_id",
-        to    => "userid",
-    };
-    push(@$joins, $join);
-
-    $args->{full_field} = $dbh->sql_string_concat("$flagtypes_table.name",
-                                                  "$flags_table.status",
-                                                  "COALESCE($flag_profile_table.login_name, '')");
-
-    $self->_do_operator_function($args);
+    # don't call build_subselect as this must run as a true sub-select
+    $args->{term} = "EXISTS (
+        SELECT 1
+          FROM $bugs_table bugs_$chart_id
+          LEFT JOIN attachments AS attachments_$chart_id
+                    ON bugs_$chart_id.bug_id = attachments_$chart_id.bug_id
+          LEFT JOIN flags AS flags_$chart_id
+                    ON bugs_$chart_id.bug_id = flags_$chart_id.bug_id
+                       AND (flags_$chart_id.attach_id = attachments_$chart_id.attach_id
+                            OR flags_$chart_id.attach_id IS NULL)
+          LEFT JOIN flagtypes AS flagtypes_$chart_id
+                    ON flags_$chart_id.type_id = flagtypes_$chart_id.id
+     WHERE bugs_$chart_id.bug_id = $bugs_table.bug_id
+           AND $subselect_term
+    )";
 }
 
 sub _multiselect_nonchanged {
diff --git a/Bugzilla/Search/Condition.pm b/Bugzilla/Search/Condition.pm
index 4975775af..eab4ab79d 100644
--- a/Bugzilla/Search/Condition.pm
+++ b/Bugzilla/Search/Condition.pm
@@ -21,9 +21,16 @@ sub new {
 }
 
 sub field    { return $_[0]->{field}    }
-sub operator { return $_[0]->{operator} }
 sub value    { return $_[0]->{value}    }
 
+sub operator {
+    my ($self, $value) = @_;
+    if (@_ == 2) {
+        $self->{operator} = $value;
+    }
+    return $self->{operator};
+}
+
 sub fov {
     my ($self) = @_;
     return ($self->field, $self->operator, $self->value);
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index d073720a1..3133b1a6b 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -364,8 +364,15 @@ sub _handle_field_names {
     my ($or_operand, $negate, $unknownFields, $ambiguous_fields) = @_;
 
     # Flag and requestee shortcut
-    if ($or_operand =~ /^(?:flag:)?([^\?]+\?[^\?]*)$/) {
-        addChart('flagtypes.name', 'substring', $1, $negate);
+    if ($or_operand =~ /^(?:flag:)?([^\?]+\?)([^\?]*)$/) {
+        my ($flagtype, $requestee) = ($1, $2);
+        addChart('flagtypes.name', 'substring', $flagtype, $negate);
+        if ($requestee) {
+            # AND
+            $chart++;
+            $and = $or = 0;
+            addChart('requestees.login_name', 'substring', $requestee, $negate);
+        }
         return 1;
     }
 

From 695ae86a82d38154497ee8f20a576c37201653a0 Mon Sep 17 00:00:00 2001
From: Tiago Mello <timello@bugzilla.org>
Date: Fri, 10 May 2013 13:23:10 +0200
Subject: [PATCH 093/240] Bug 842068: Add 'group_updated_fields' hook to
 'global/messages.html.tmpl' r=dkl a=LpSolit

---
 template/en/default/global/messages.html.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 7dc3767f4..95b74f1df 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -421,6 +421,8 @@
           [% CASE 'visible_to_me_remove' %]
             <li>This group may no longer see users in the following groups:
               [%+ changes.visible_to_me_remove.join(', ') FILTER html %]</li>
+          [% CASE %]
+            [% Hook.process('group_updated_fields') %]
         [% END %]
       [% END %]
       </ul>

From 64dcd5a647db809e84b58e1d01130e92c3d73952 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 10 May 2013 10:44:47 -0400
Subject: [PATCH 094/240] Bug 850135 - hide the textarea custom fields by
 default with an (edit) link r=glob,a=LpSolit

---
 js/field.js                             | 14 +++++++------
 skins/standard/global.css               | 17 +++++++++++++++-
 template/en/default/bug/field.html.tmpl | 27 ++++++++++++++++++++++---
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/js/field.js b/js/field.js
index c0d0aaa6e..900299ee0 100644
--- a/js/field.js
+++ b/js/field.js
@@ -214,14 +214,14 @@ function setupEditLink(id) {
 }
 
 /* Hide input/select fields and show the text with (edit) next to it */
-function hideEditableField( container, input, action, field_id, original_value, new_value ) {
+function hideEditableField( container, input, action, field_id, original_value, new_value, hide_input ) {
     YAHOO.util.Dom.removeClass(container, 'bz_default_hidden');
     YAHOO.util.Dom.addClass(input, 'bz_default_hidden');
     YAHOO.util.Event.addListener(action, 'click', showEditableField,
                                  new Array(container, input, field_id, new_value));
     if(field_id != ""){
         YAHOO.util.Event.addListener(window, 'load', checkForChangedFieldValues,
-                        new Array(container, input, field_id, original_value));
+                        new Array(container, input, field_id, original_value, hide_input ));
     }
 }
 
@@ -269,7 +269,7 @@ function showEditableField (e, ContainerInputArray) {
         }
         // focus on the first field, this makes it easier to edit
         inputs[0].focus();
-        if ( type == "input" ) {
+        if ( type == "input" || type == "textarea" ) {
             inputs[0].select();
         }
     }
@@ -293,8 +293,10 @@ function checkForChangedFieldValues(e, ContainerInputArray ) {
     var el = document.getElementById(ContainerInputArray[2]);
     var unhide = false;
     if ( el ) {
-        if ( el.value != ContainerInputArray[3] ||
-            ( el.value == "" && el.id != "alias" && el.id != 'qa_contact') ) {
+        if ( !ContainerInputArray[4]
+             && (el.value != ContainerInputArray[3]
+                 || (el.value == "" && el.id != "alias" && el.id != "qa_contact")) )
+        {
             unhide = true;
         }
         else {
@@ -303,7 +305,7 @@ function checkForChangedFieldValues(e, ContainerInputArray ) {
             if ( set_default ) {
                 if(set_default.checked){
                     unhide = true;
-                }              
+                }
             }
         }
     }
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 3ca350dba..b1c9a7d07 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -520,8 +520,23 @@ input.required, select.required, span.required_explanation {
     list-style-type: none;
 }
 
+.field_textarea_readonly {
+    margin: 2px;
+    padding: 4px;
+    overflow: auto;
+    float: left;
+    max-width: 30em;
+    max-height: 7em;
+    border: 1px solid #CCC;
+}
+
+.field_textarea_readonly pre {
+    font-family: monospace;
+    white-space: pre-wrap;
+}
+
 /* custom styles for inline instances of autocomplete input fields */
-.yui-skin-sam .yui-ac-input { position:static !important; 
+.yui-skin-sam .yui-ac-input { position:static !important;
                               vertical-align:middle !important; }
 .yui-skin-sam .yui-ac-container { left:0px !important; }
 .yui-skin-sam .yui-ac { display: inline-block; }
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index a77f9087c..c086a04f7 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -142,9 +142,30 @@
         </script>
 
      [% CASE constants.FIELD_TYPE_TEXTAREA %]
-       [% INCLUDE global/textarea.html.tmpl
-           id = field.name name = field.name minrows = 4 maxrows = 8
-           cols = 60 defaultcontent = value mandatory = field.is_mandatory %]
+       <div id="[% field.name FILTER html %]_edit_container" class="bz_default_hidden">
+         <div>
+             (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>)
+         </div>
+         [% IF value %]
+           <div class="field_textarea_readonly">
+             <pre>[% value FILTER html %]</pre>
+           </div>
+         [% END %]
+       </div>
+       <div id="[% field.name FILTER html %]_input">
+         [% INCLUDE global/textarea.html.tmpl
+            id = field.name name = field.name minrows = 4 maxrows = 8
+            cols = 60 defaultcontent = value mandatory = field.is_mandatory %]
+       </div>
+       <script type="text/javascript">
+         hideEditableField('[% field.name FILTER js %]_edit_container',
+                           '[% field.name FILTER js %]_input',
+                           '[% field.name FILTER js %]_edit_action',
+                           '[% field.name FILTER js %]',
+                           '[% value FILTER js %]',
+                           '',
+                           true);
+       </script>
      [% CASE constants.FIELD_TYPE_BUG_URLS %]
        [% '<ul class="bug_urls">' IF value.size %]
        [% FOREACH bug_url = value %]

From 773955decb7278dae997e3e1fb911786e6bb60f4 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 10 May 2013 10:59:39 -0400
Subject: [PATCH 095/240] Bug 850135 - hide the textarea custom fields by
 default with an (edit) link - Removal of div around pre as suggested by
 reviewer

---
 template/en/default/bug/field.html.tmpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index c086a04f7..0ef19c1c4 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -147,9 +147,7 @@
              (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>)
          </div>
          [% IF value %]
-           <div class="field_textarea_readonly">
-             <pre>[% value FILTER html %]</pre>
-           </div>
+           <pre class="field_textarea_readonly">[% value FILTER html %]</pre>
          [% END %]
        </div>
        <div id="[% field.name FILTER html %]_input">

From 1fff3ec6c60d4db4eced91b816d974175734828c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sat, 18 May 2013 16:08:54 +0200
Subject: [PATCH 096/240] Bug 870700: Release notes for Bugzilla 4.4 r=dkl
 a=LpSolit

---
 template/en/default/pages/release-notes.html.tmpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 5fab4615c..c35b08893 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -28,7 +28,7 @@
 
 <h2 id="v44_introduction">Introduction</h2>
 
-<p>Welcome to [% terms.Bugzilla %] 4.4! It has been almost a year since we
+<p>Welcome to [% terms.Bugzilla %] 4.4! It has been over a year since we
   released [% terms.Bugzilla %] 4.2 on February 2012, and this new major
   release comes with several new features and improvements. This release
   contains major improvements to WebServices, which were our main target in
@@ -380,6 +380,7 @@
   <li><strong>Administration:</strong> The result code returned by
     <kbd>contrib/bugzilla-queue.rhel</kbd> when it's not running is now 2
     instead of 0.</li>
+  <li><strong>Database:</strong> Support for MySQL 5.6 has been added.</li>
   <li><strong>Database:</strong> Support for Oracle has been greatly improved.</li>
   <li><strong>Security:</strong> For improved security, the
     "X-Content-Type-Options:&nbsp;nosniff" and "X-XSS-Protection:&nbsp;block"
@@ -426,6 +427,9 @@
   <li>Field names returned in the <kbd>field_name</kbd> field of the
     <kbd>B[%%]ug.history</kbd> method have changed to be consistent with other
     methods.</li>
+  <li>The <kbd>B[%%]ug.search</kbd> method was returning all visible [% terms.bugs %]
+    when called with no arguments, ignoring the <kbd>max_search_results</kbd>
+    and <kbd>search_allow_no_criteria</kbd> parameters. This has been fixed.</li>
   <li><kbd>Product.get</kbd> now also returns the <kbd>flag_types</kbd> field
     containing all the relevant data for attachment and [% terms.bug %] flag types.</li>
   <li><kbd>Product.get</kbd> now throws an error if neither <kbd>ids</kbd> nor

From cae8ff0c19629c1a309eec89b69987cb9b032137 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Mon, 20 May 2013 15:45:42 +0200
Subject: [PATCH 097/240] Bug 873920: Whine e-mails to other people includes
 invalid link r/a=LpSolit

---
 template/en/default/whine/mail.html.tmpl | 8 +++++---
 template/en/default/whine/mail.txt.tmpl  | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl
index 72e7d8004..21784299e 100644
--- a/template/en/default/whine/mail.html.tmpl
+++ b/template/en/default/whine/mail.html.tmpl
@@ -66,9 +66,11 @@
       [% END %]
     </table>
 
-    <p align="left">
-    <a href="[% urlbase FILTER html %]buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% query.name FILTER uri %]">View as [% terms.bug %] list</a>
-    </p>
+    [% IF author.login == recipient.login %]
+      <p align="left">
+        <a href="[% urlbase FILTER html %]buglist.cgi?cmdtype=runnamed&amp;namedcmd=[% query.name FILTER uri %]">View as [% terms.bug %] list</a>
+      </p>
+    [% END %]
   [% END %]
 [% ELSE %]
 
diff --git a/template/en/default/whine/mail.txt.tmpl b/template/en/default/whine/mail.txt.tmpl
index ba1e95741..845869db4 100644
--- a/template/en/default/whine/mail.txt.tmpl
+++ b/template/en/default/whine/mail.txt.tmpl
@@ -51,8 +51,10 @@
 
   [% END %]
 
+  [% IF author.login == recipient.login %]
 View as [% terms.bug %] list: [% urlbase %]buglist.cgi?cmdtype=runnamed&namedcmd=[% query.name FILTER uri %]
   [% END %]
+  [% END %]
 [% ELSE %]
 
   No [% terms.bugs %] were found that matched the search criteria.

From edbbd33051165c8076bdf5795de42a99a6a168ec Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Tue, 21 May 2013 01:55:05 +0800
Subject: [PATCH 098/240] Bug 828344: "contains all of the words" no longer
 looks for all words within the same comment or flag r=LpSolit, a=LpSolit

---
 xt/lib/Bugzilla/Test/Search/Constants.pm | 83 +++++++++++++++++++++---
 xt/lib/Bugzilla/Test/Search/FieldTest.pm | 32 +++++++--
 2 files changed, 99 insertions(+), 16 deletions(-)

diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm
index 53837ba58..79b1b72f4 100644
--- a/xt/lib/Bugzilla/Test/Search/Constants.pm
+++ b/xt/lib/Bugzilla/Test/Search/Constants.pm
@@ -183,11 +183,14 @@ use constant GREATERTHAN_BROKEN => (
 );
 
 # allwords and allwordssubstr have these broken tests in common.
-#
-# allwordssubstr on cc fields matches against a single cc,
-# instead of matching against all ccs on a bug.
 use constant ALLWORDS_BROKEN => (
+    # allwordssubstr on cc fields matches against a single cc,
+    # instead of matching against all ccs on a bug.
     cc        => { contains => [1] },
+    # bug 828344 changed how these searches operate to revert back to the 4.0
+    # behavour, so these tests need to be updated (bug 849117).
+    'flagtypes.name' => { contains => [1] },
+    longdesc         => { contains => [1] },
 );
 
 # Fields that don't generally work at all with changed* searches, but
@@ -312,6 +315,24 @@ use constant KNOWN_BROKEN => {
         # This should probably search the reporter.
         creation_ts => { contains => [1] },
     },
+    notequals => {
+        'flagtypes.name' => { contains => [1, 5] },
+        longdesc         => { contains => [1] },
+    },
+    notregexp => {
+        'flagtypes.name' => { contains => [1, 5] },
+        longdesc         => { contains => [1] },
+    },
+    notsubstring => {
+        'flagtypes.name' => { contains => [5] },
+        longdesc         => { contains => [1] },
+    },
+    nowords => {
+        'flagtypes.name' => { contains => [1, 5] },
+    },
+    nowordssubstr => {
+        'flagtypes.name' => { contains => [5] },
+    },
 };
 
 ###################
@@ -342,17 +363,34 @@ use constant CHANGED_FROM_TO_BROKEN_NOT => (
 
 # These are field/operator combinations that are broken when run under NOT().
 use constant BROKEN_NOT => {
-    allwords       => {
-        cc => { contains => [1] },
+    allwords => {
+        cc               => { contains => [1] },
+        'flagtypes.name' => { contains => [1, 5] },
+        longdesc         => { contains => [1] },
     },
     'allwords-<1> <2>' => {
         cc => { },
     },
     allwordssubstr => {
-        cc => { contains => [1] },
+        cc               => { contains => [1] },
+        'flagtypes.name' => { contains => [5, 6] },
+        longdesc         => { contains => [1] },
     },
     'allwordssubstr-<1>,<2>' => {
-        cc => { },
+        cc               => { },
+        longdesc         => { contains => [1] },
+    },
+    anyexact => {
+        'flagtypes.name' => { contains => [1, 2, 5] },
+    },
+    anywords => {
+        'flagtypes.name' => { contains => [1, 2, 5] },
+    },
+    anywordssubstr => {
+        'flagtypes.name' => { contains => [5] },
+    },
+    casesubstring => {
+        'flagtypes.name' => { contains => [5] },
     },
     changedafter => {
         "attach_data.thedata"   => { contains => [2, 3, 4] },
@@ -379,7 +417,6 @@ use constant BROKEN_NOT => {
         dependson       => { contains => [1, 3] },
         work_time       => { contains => [1] },
         FIELD_TYPE_BUG_ID, { contains => [1 .. 4] },
-        
     },
     changedto => {
         CHANGED_BROKEN_NOT,
@@ -388,10 +425,38 @@ use constant BROKEN_NOT => {
         "remaining_time" => { contains => [1] },
     },
     greaterthan => {
-        cc        => { contains => [1] },
+        cc               => { contains => [1] },
+        'flagtypes.name' => { contains => [5] },
     },
     greaterthaneq => {
         cc               => { contains => [1] },
+        'flagtypes.name' => { contains => [2, 5] },
+    },
+    equals => {
+        'flagtypes.name' => { contains => [1, 5] },
+    },
+    notequals => {
+        longdesc         => { contains => [1] },
+    },
+    notregexp => {
+        longdesc         => { contains => [1] },
+    },
+    notsubstring => {
+        longdesc         => { contains => [1] },
+    },
+    lessthan => {
+        'flagtypes.name' => { contains => [5] },
+    },
+    lessthaneq => {
+        'flagtypes.name' => { contains => [1, 5] },
+    },
+    regexp => {
+        'flagtypes.name' => { contains => [1, 5] },
+        longdesc         => { contains => [1] },
+    },
+    substring => {
+        'flagtypes.name' => { contains => [5] },
+        longdesc         => { contains => [1] },
     },
 };
 
diff --git a/xt/lib/Bugzilla/Test/Search/FieldTest.pm b/xt/lib/Bugzilla/Test/Search/FieldTest.pm
index c92a6a7b6..5e86d92e2 100644
--- a/xt/lib/Bugzilla/Test/Search/FieldTest.pm
+++ b/xt/lib/Bugzilla/Test/Search/FieldTest.pm
@@ -14,6 +14,7 @@ use strict;
 use warnings;
 use Bugzilla::Search;
 use Bugzilla::Test::Search::Constants;
+use Bugzilla::Util qw(trim);
 
 use Data::Dumper;
 use Scalar::Util qw(blessed);
@@ -58,6 +59,13 @@ sub bug {
     my $self = shift;
     return $self->search_test->bug(@_);
 }
+sub number {
+    my ($self, $id) = @_;
+    foreach my $number (1..NUM_BUGS) {
+        return $number if $self->search_test->bug($number)->id == $id;
+    }
+    return 0;
+}
 
 # The name displayed for this test by Test::More. Used in test descriptions.
 sub name {
@@ -133,9 +141,18 @@ sub translated_value {
     return $self->{translated_value};
 }
 # Used in failure diagnostic messages.
-sub debug_value {
-    my ($self) = @_;
-    return "Value: '" . $self->translated_value . "'";
+sub debug_fail {
+    my ($self, $number, $results, $sql) = @_;
+    my @expected = @{ $self->test->{contains} };
+    my @results = sort
+                  map { $self->number($_) }
+                  map { $_->[0] }
+                  @$results;
+    return
+        "   Value: '" . $self->translated_value . "'\n" .
+        "Expected: [" . join(',', @expected) . "]\n" .
+        " Results: [" . join(',', @results) . "]\n" .
+        trim($sql) . "\n";
 }
 
 # True for a bug if we ran the "transform" function on it and the
@@ -170,6 +187,7 @@ sub bug_is_contained {
 # The tests we know are broken for this operator/field combination.
 sub _known_broken {
     my ($self, $constant, $skip_pg_check) = @_;
+
     $constant ||= KNOWN_BROKEN;
     my $field = $self->field;
     my $type = $self->field_object->type;
@@ -178,8 +196,8 @@ sub _known_broken {
     my $value_name = "$operator-$value";
     if (my $extra_name = $self->test->{extra_name}) {
         $value_name .= "-$extra_name";
-    }    
-    
+    }
+
     my $value_broken = $constant->{$value_name}->{$field};
     $value_broken ||= $constant->{$value_name}->{$type};
     return $value_broken if $value_broken;
@@ -586,12 +604,12 @@ sub _test_content_for_bug {
         if ($self->bug_is_contained($number)) {
             ok($result_ids{$bug_id},
                "$name: contains bug $number ($bug_id)")
-                or diag Dumper($results) . $self->debug_value . "\n\nSQL: $sql";
+                or diag $self->debug_fail($number, $results, $sql);
         }
         else {
             ok(!$result_ids{$bug_id},
                "$name: does not contain bug $number ($bug_id)")
-                or diag Dumper($results) . $self->debug_value . "\n\nSQL: $sql";
+                or diag $self->debug_fail($number, $results, $sql);
         }
     }
 }

From c9b94759e3edd86b4127a844ac76fd94442a9e43 Mon Sep 17 00:00:00 2001
From: Marc Schumann <wurblzap@gmail.com>
Date: Wed, 22 May 2013 13:12:44 +0200
Subject: [PATCH 099/240] Bug 874827 - Remove superfluous "and" in 4.4 release
 notes. r/a=LpSolit

---
 template/en/default/pages/release-notes.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index c35b08893..6fc7ddbbd 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -160,7 +160,7 @@
 <p>
   The search system got a performance boost which in some cases decreases the
   time spent to run queries from several minutes to a few seconds only.
-  The more complex your queries are, and the more visible the performance win
+  The more complex your queries are, the more visible the performance win
   should be.
 </p>
 

From c827f250ac358751d6fe387c7f2993741ed5d4f6 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 23 May 2013 00:57:41 +0800
Subject: [PATCH 100/240] Bug 828344: add missing xt broken tests

---
 xt/lib/Bugzilla/Test/Search/Constants.pm | 25 ++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm
index 79b1b72f4..24a67e89d 100644
--- a/xt/lib/Bugzilla/Test/Search/Constants.pm
+++ b/xt/lib/Bugzilla/Test/Search/Constants.pm
@@ -245,6 +245,15 @@ use constant KNOWN_BROKEN => {
     'allwords-<1>' => {
         ALLWORDS_BROKEN,
     },
+    'anywords-<1>' => {
+        'flagtypes.name' => { contains => [1,2,3,4,5] },
+    },
+    'anywords-<1> <2>' => {
+        'flagtypes.name' => { contains => [3,4,5] },
+    },
+    'anywordssubstr-<1> <2>' => {
+        'flagtypes.name' => { contains => [3,4,5] },
+    },
 
     # setters.login_name and requestees.login name aren't tracked individually
     # in bugs_activity, so can't be searched using this method.
@@ -383,12 +392,18 @@ use constant BROKEN_NOT => {
     anyexact => {
         'flagtypes.name' => { contains => [1, 2, 5] },
     },
-    anywords => {
-        'flagtypes.name' => { contains => [1, 2, 5] },
+    'anywords-<1>' => {
+        'flagtypes.name' => { contains => [1, 2, 3, 4, 5] },
+    },
+    'anywords-<1> <2>' => {
+        'flagtypes.name' => { contains => [3, 4, 5] },
     },
     anywordssubstr => {
         'flagtypes.name' => { contains => [5] },
     },
+    'anywordssubstr-<1> <2>' => {
+        'flagtypes.name' => { contains => [3,4,5] },
+    },
     casesubstring => {
         'flagtypes.name' => { contains => [5] },
     },
@@ -444,6 +459,12 @@ use constant BROKEN_NOT => {
     notsubstring => {
         longdesc         => { contains => [1] },
     },
+    'nowords-<1>' => {
+        'flagtypes.name' => { contains => [5] },
+    },
+    'nowordssubstr-<1>' => {
+        'flagtypes.name' => { contains => [5] },
+    },
     lessthan => {
         'flagtypes.name' => { contains => [5] },
     },

From 9bca5ac569f437711ae4d6c8f12f3198d7de6ec4 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Wed, 5 Jun 2013 13:29:58 +0800
Subject: [PATCH 101/240] Bug 879055: Add parenthesis to prevent anywordssubstr
 search from returning incorrect results. r=glob, a=LpSolit

---
 Bugzilla/Search.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index a91a25b06..0f395bde9 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -2682,7 +2682,7 @@ sub _owner_idle_time_greater_less {
             "$ld_table.who IS NULL AND $act_table.who IS NULL";
     } else {
          $args->{term} =
-            "$ld_table.who IS NOT NULL OR $act_table.who IS NOT NULL";
+            "($ld_table.who IS NOT NULL OR $act_table.who IS NOT NULL)";
     }
 }
 
@@ -2926,14 +2926,14 @@ sub _anywordsubstr {
     my ($self, $args) = @_;
 
     my @terms = $self->_substring_terms($args);
-    $args->{term} = join("\n\tOR ", @terms);
+    $args->{term} = '(' . join("\n\tOR ", @terms) . ')';
 }
 
 sub _allwordssubstr {
     my ($self, $args) = @_;
 
     my @terms = $self->_substring_terms($args);
-    $args->{term} = join("\n\tAND ", @terms);
+    $args->{term} = '(' . join("\n\tAND ", @terms) . ')';
 }
 
 sub _nowordssubstr {
@@ -2945,19 +2945,19 @@ sub _nowordssubstr {
 
 sub _anywords {
     my ($self, $args) = @_;
-    
+
     my @terms = $self->_word_terms($args);
     # Because _word_terms uses AND, we need to parenthesize its terms
     # if there are more than one.
     @terms = map("($_)", @terms) if scalar(@terms) > 1;
-    $args->{term} = join("\n\tOR ", @terms);
+    $args->{term} = '(' . join("\n\tOR ", @terms) . ')';
 }
 
 sub _allwords {
     my ($self, $args) = @_;
-    
+
     my @terms = $self->_word_terms($args);
-    $args->{term} = join("\n\tAND ", @terms);
+    $args->{term} = '(' . join("\n\tAND ", @terms) . ')';
 }
 
 sub _nowords {

From 6c777e6576ac18e63e84032e98a34acb43eb298f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 5 Jun 2013 14:39:19 +0200
Subject: [PATCH 102/240] Bug 874944: Do not display the Excluded list when
 sending bugmails r=dkl a=LpSolit

---
 Bugzilla/BugMail.pm                           | 25 +++++----------
 contrib/sendbugmail.pl                        | 31 +++++++------------
 contrib/sendunsentbugmail.pl                  | 29 +++++++----------
 .../en/default/bug/process/bugmail.html.tmpl  | 24 +++-----------
 4 files changed, 34 insertions(+), 75 deletions(-)

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 12914ca73..68962fc66 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -106,6 +106,9 @@ sub Send {
     # Skip empty comments.
     @$comments = grep { $_->type || $_->body =~ /\S/ } @$comments;
 
+    # If no changes have been made, there is no need to process further.
+    return {'sent' => []} unless scalar(@diffs) || scalar(@$comments);
+
     ###########################################################################
     # Start of email filtering code
     ###########################################################################
@@ -197,7 +200,6 @@ sub Send {
     # the bug in question. However, we are not necessarily going to mail them
     # all - there are preferences, permissions checks and all sorts to do yet.
     my @sent;
-    my @excluded;
 
     # The email client will display the Date: header in the desired timezone,
     # so we can always use UTC here.
@@ -206,18 +208,13 @@ sub Send {
 
     foreach my $user_id (keys %recipients) {
         my %rels_which_want;
-        my $sent_mail = 0;
-        $user_cache{$user_id} ||= new Bugzilla::User($user_id);
-        my $user = $user_cache{$user_id};
+        my $user = $user_cache{$user_id} ||= new Bugzilla::User($user_id);
         # Deleted users must be excluded.
         next unless $user;
 
         # If email notifications are disabled for this account, or the bug
         # is ignored, there is no need to do additional checks.
-        if ($user->email_disabled || $user->is_bug_ignored($id)) {
-            push(@excluded, $user->login);
-            next;
-        }
+        next if ($user->email_disabled || $user->is_bug_ignored($id));
 
         if ($user->can_see_bug($id)) {
             # Go through each role the user has and see if they want mail in
@@ -250,7 +247,7 @@ sub Send {
 
             # Email the user if the dep check passed.
             if ($dep_ok) {
-                $sent_mail = sendMail(
+                my $sent_mail = sendMail(
                     { to       => $user, 
                       bug      => $bug,
                       comments => $comments,
@@ -261,15 +258,9 @@ sub Send {
                       diffs    => \@diffs,
                       rels_which_want => \%rels_which_want,
                     });
+                push(@sent, $user->login) if $sent_mail;
             }
         }
-
-        if ($sent_mail) {
-            push(@sent, $user->login); 
-        } 
-        else {
-            push(@excluded, $user->login); 
-        } 
     }
 
     # When sending bugmail about a blocker being reopened or resolved,
@@ -281,7 +272,7 @@ sub Send {
         $bug->{lastdiffed} = $end;
     }
 
-    return {'sent' => \@sent, 'excluded' => \@excluded};
+    return {'sent' => \@sent};
 }
 
 sub sendMail {
diff --git a/contrib/sendbugmail.pl b/contrib/sendbugmail.pl
index c015810b0..da0eafd30 100755
--- a/contrib/sendbugmail.pl
+++ b/contrib/sendbugmail.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl -wT
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -6,6 +6,8 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
+use strict;
 use lib qw(. lib);
 
 use Bugzilla;
@@ -16,7 +18,7 @@ use Bugzilla::User;
 my $dbh = Bugzilla->dbh;
 
 sub usage {
-    print STDERR "Usage: $0 bug_id user_email\n";
+    say STDERR "Usage: $0 bug_id user_email";
     exit;
 }
 
@@ -30,7 +32,7 @@ my $changer = $ARGV[1];
 
 # Validate the bug number.
 if (!($bugnum =~ /^(\d+)$/)) {
-  print STDERR "Bug number \"$bugnum\" not numeric.\n";
+  say STDERR "Bug number \"$bugnum\" not numeric.";
   usage();
 }
 
@@ -40,19 +42,19 @@ my ($id) = $dbh->selectrow_array("SELECT bug_id FROM bugs WHERE bug_id = ?",
                                  undef, $bugnum);
 
 if (!$id) {
-  print STDERR "Bug number $bugnum does not exist.\n";
+  say STDERR "Bug number $bugnum does not exist.";
   usage();
 }
 
 # Validate the changer address.
 my $match = Bugzilla->params->{'emailregexp'};
 if ($changer !~ /$match/) {
-    print STDERR "Changer \"$changer\" doesn't match email regular expression.\n";
+    say STDERR "Changer \"$changer\" doesn't match email regular expression.";
     usage();
 }
 my $changer_user = new Bugzilla::User({ name => $changer });
 unless ($changer_user) {
-    print STDERR "\"$changer\" is not a valid user.\n";
+    say STDERR "\"$changer\" is not a valid user.";
     usage();
 }
 
@@ -61,26 +63,15 @@ my $outputref = Bugzilla::BugMail::Send($bugnum, {'changer' => $changer_user });
 
 # Report the results.
 my $sent = scalar(@{$outputref->{sent}});
-my $excluded = scalar(@{$outputref->{excluded}});
 
 if ($sent) {
-    print "email sent to $sent recipients:\n";
+    say "email sent to $sent recipients:";
 } else {
-    print "No email sent.\n";
+    say "No email sent.";
 }
 
 foreach my $sent (@{$outputref->{sent}}) {
-  print "  $sent\n";
-}
-
-if ($excluded) {
-    print "$excluded recipients excluded:\n";
-} else {
-    print "No recipients excluded.\n";
-}
-
-foreach my $excluded (@{$outputref->{excluded}}) {
-  print "  $excluded\n";
+  say "  $sent";
 }
 
 # This document is copyright (C) 2004 Perforce Software, Inc.  All rights
diff --git a/contrib/sendunsentbugmail.pl b/contrib/sendunsentbugmail.pl
index 94ad25de4..536d12146 100755
--- a/contrib/sendunsentbugmail.pl
+++ b/contrib/sendunsentbugmail.pl
@@ -6,8 +6,8 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
-
 use lib qw(. lib);
 
 use Bugzilla;
@@ -25,28 +25,21 @@ my $list = $dbh->selectcol_arrayref(
      ' ORDER BY bug_id');
 
 if (scalar(@$list) > 0) {
-    print "OK, now attempting to send unsent mail\n";
-    print scalar(@$list) . " bugs found with possibly unsent mail.\n\n";
+    say "OK, now attempting to send unsent mail";
+    say scalar(@$list) . " bugs found with possibly unsent mail.\n";
     foreach my $bugid (@$list) {
         my $start_time = time;
-        print "Sending mail for bug $bugid...\n";
+        say "Sending mail for bug $bugid...";
         my $outputref = Bugzilla::BugMail::Send($bugid);
         if ($ARGV[0] && $ARGV[0] eq "--report") {
-          print "Mail sent to:\n";
-          foreach (sort @{$outputref->{sent}}) {
-              print $_ . "\n";
-          }
-          
-          print "Excluded:\n";
-          foreach (sort @{$outputref->{excluded}}) {
-              print $_ . "\n";
-          }
+          say "Mail sent to:";
+          say $_ foreach (sort @{$outputref->{sent}});
         }
         else {
-            my ($sent, $excluded) = (scalar(@{$outputref->{sent}}),scalar(@{$outputref->{excluded}}));
-            print "$sent mails sent, $excluded people excluded.\n";
-            print "Took " . (time - $start_time) . " seconds.\n\n";
-        }    
+            my $sent = scalar @{$outputref->{sent}};
+            say "$sent mails sent.";
+            say "Took " . (time - $start_time) . " seconds.\n";
+        }
     }
-    print "Unsent mail has been sent.\n";
+    say "Unsent mail has been sent.";
 }
diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl
index b1c38da96..0d77e6f66 100644
--- a/template/en/default/bug/process/bugmail.html.tmpl
+++ b/template/en/default/bug/process/bugmail.html.tmpl
@@ -12,27 +12,11 @@
   #%]
 
 <dl>
-[% PROCESS emails
-   description = "Email sent to"
-   names = sent_bugmail.sent
-%]
-
-[% PROCESS emails
-   description = "Excluding"
-   names = sent_bugmail.excluded
-%]
-</dl>
-
-[%############################################################################%]
-[%# Block for a set of email addresses                                       #%]
-[%############################################################################%]
-
-[% BLOCK emails %]
-  <dt>[% description FILTER html %]:</dt>
+  <dt>Email sent to:</dt>
   <dd>
   [% IF user.can_see_bug(mailing_bugid) %]
-    [% IF names.size > 0 %]
-      [%+ FOREACH name = names %]
+    [% IF sent_bugmail.sent.size %]
+      [% FOREACH name = sent_bugmail.sent %]
         <code>[% name FILTER html %]</code>[% ", " UNLESS loop.last() %]
       [% END %]
     [% ELSE %]
@@ -42,4 +26,4 @@
     (list of e-mails not available)
   [% END %]
   </dd>
-[% END %]
+</dl>

From 39990f733a0b39a99a95cf25734736ebe9a5adc8 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@yahoo.com>
Date: Wed, 5 Jun 2013 20:12:30 +0200
Subject: [PATCH 103/240] Bug 875744: Bug history messed up when two comments
 are made private r/a=LpSolit

---
 Bugzilla/Bug.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 576ce9d52..985978cb6 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3944,6 +3944,7 @@ sub get_activity {
             if ($operation->{'who'} && $who eq $operation->{'who'}
                 && $when eq $operation->{'when'}
                 && $fieldname eq $operation->{'fieldname'}
+                && ($comment_id || 0) == ($operation->{'comment_id'} || 0)
                 && ($attachid || 0) == ($operation->{'attachid'} || 0))
             {
                 my $old_change = pop @$changes;
@@ -3958,7 +3959,7 @@ sub get_activity {
             $change{'added'} = $added;
 
             if ($comment_id) {
-                $change{'comment'} = Bugzilla::Comment->new($comment_id);
+		$operation->{comment_id} = $change{'comment'} = Bugzilla::Comment->new($comment_id);
             }
 
             push (@$changes, \%change);

From 801f4a1debb8ca282243ebcbe4136eabc31dd6a2 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Wed, 5 Jun 2013 20:22:00 +0200
Subject: [PATCH 104/240] Bug 878623: Improvement in retrieving a
 classification name from bug r=glob a=LpSolit

---
 Bugzilla/Bug.pm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 985978cb6..6eaed9357 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3308,21 +3308,15 @@ sub component_obj {
 
 sub classification_id {
     my ($self) = @_;
-    return $self->{classification_id} if exists $self->{classification_id};
     return 0 if $self->{error};
-    ($self->{classification_id}) = Bugzilla->dbh->selectrow_array(
-        'SELECT classification_id FROM products WHERE id = ?',
-        undef, $self->{product_id});
+    $self->{classification_id} //= $self->product_obj->classification_id;
     return $self->{classification_id};
 }
 
 sub classification {
     my ($self) = @_;
-    return $self->{classification} if exists $self->{classification};
     return '' if $self->{error};
-    ($self->{classification}) = Bugzilla->dbh->selectrow_array(
-        'SELECT name FROM classifications WHERE id = ?',
-        undef, $self->classification_id);
+    $self->{classification} //= $self->product_obj->classification->name;
     return $self->{classification};
 }
 

From 3b82d686bccb950a13c09b8e33794a93c15d6e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 5 Jun 2013 21:04:42 +0200
Subject: [PATCH 105/240] Remove tabs

---
 Bugzilla/Bug.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 6eaed9357..fc704df5e 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3953,7 +3953,7 @@ sub get_activity {
             $change{'added'} = $added;
 
             if ($comment_id) {
-		$operation->{comment_id} = $change{'comment'} = Bugzilla::Comment->new($comment_id);
+                $operation->{comment_id} = $change{'comment'} = Bugzilla::Comment->new($comment_id);
             }
 
             push (@$changes, \%change);

From 47f40d0ee407785218132e7368e558efc243b7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 6 Jun 2013 22:46:30 +0200
Subject: [PATCH 106/240] Bug 878035: Do not disclose whether a user account
 exists or not when a user clicks "forgot password" r=dkl a=LpSolit

---
 Bugzilla/Token.pm                                         | 4 +++-
 .../default/account/password/forgotten-password.txt.tmpl  | 8 +++++++-
 template/en/default/global/messages.html.tmpl             | 3 ++-
 token.cgi                                                 | 7 ++++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 183c11f96..d4224e33b 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -122,13 +122,15 @@ sub IssuePasswordToken {
 
     ThrowUserError('too_soon_for_new_token', {'type' => 'password'}) if $too_soon;
 
-    my ($token, $token_ts) = _create_token($user->id, 'password', remote_ip());
+    my $ip_addr = remote_ip();
+    my ($token, $token_ts) = _create_token($user->id, 'password', $ip_addr);
 
     # Mail the user the token along with instructions for using it.
     my $template = Bugzilla->template_inner($user->setting('lang'));
     my $vars = {};
 
     $vars->{'token'} = $token;
+    $vars->{'ip_addr'} = $ip_addr;
     $vars->{'emailaddress'} = $user->email;
     $vars->{'expiration_ts'} = ctime($token_ts + MAX_TOKEN_AGE * 86400);
     # The user is not logged in (else he wouldn't request a new password).
diff --git a/template/en/default/account/password/forgotten-password.txt.tmpl b/template/en/default/account/password/forgotten-password.txt.tmpl
index 0c135a9ed..de2e79596 100644
--- a/template/en/default/account/password/forgotten-password.txt.tmpl
+++ b/template/en/default/account/password/forgotten-password.txt.tmpl
@@ -12,7 +12,9 @@ Subject:  [% terms.Bugzilla %] Change Password Request
 X-Bugzilla-Type: admin
 
 You have (or someone impersonating you has) requested to change your 
-[%+ terms.Bugzilla %] password. To complete the change, visit the following link:
+[%+ terms.Bugzilla %] password. The request originated from [% ip_addr %].
+
+To complete the change, visit the following link:
 
 [%+ urlbase %]token.cgi?t=[% token FILTER uri %]&a=cfmpw
 
@@ -24,3 +26,7 @@ this request, visit the following link:
 If you do nothing, the request will lapse after [% constants.MAX_TOKEN_AGE %] days
 (on [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z", timezone) %]) or when you
 log in successfully.
+
+If you think someone tried to compromise your account, please inform
+[%+ Param('maintainer') %] with the IP address reported above
+and the exact time when you got this email.
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 95b74f1df..885198668 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -571,7 +571,8 @@
 
   [% ELSIF message_tag == "password_change_request" %]
     [% title = "Request to Change Password" %]
-    A token for changing your password has been emailed to you.
+    A token for changing your password has been emailed to
+    <em>[% login_name FILTER html %]</em>.
     Follow the instructions in that email to change your password.
 
   [% ELSIF message_tag == "password_changed" %]
diff --git a/token.cgi b/token.cgi
index c1630ec91..030d264af 100755
--- a/token.cgi
+++ b/token.cgi
@@ -124,17 +124,18 @@ sub requestChangePassword {
       or ThrowUserError("login_needed_for_password_change");
 
     check_email_syntax($login_name);
-    my $user = Bugzilla::User->check($login_name);
+    my $user = new Bugzilla::User({ name => $login_name });
 
     # Make sure the user account is active.
-    if (!$user->is_enabled) {
+    if ($user && !$user->is_enabled) {
         ThrowUserError('account_disabled',
                        {disabled_reason => get_text('account_disabled', {account => $login_name})});
     }
 
-    Bugzilla::Token::IssuePasswordToken($user);
+    Bugzilla::Token::IssuePasswordToken($user) if $user;
 
     $vars->{'message'} = "password_change_request";
+    $vars->{'login_name'} = $login_name;
 
     print $cgi->header();
     $template->process("global/message.html.tmpl", $vars)

From 2c7d4802c76fcf5d04d997948f101224d225371a Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 7 Jun 2013 13:27:25 +0800
Subject: [PATCH 107/240] Bug 880315: Fix malformed sql generated by the fix
 for bug 879055 r=LpSolit, a=LpSolit

---
 Bugzilla/Search.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 0f395bde9..7205f09c5 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -2926,14 +2926,14 @@ sub _anywordsubstr {
     my ($self, $args) = @_;
 
     my @terms = $self->_substring_terms($args);
-    $args->{term} = '(' . join("\n\tOR ", @terms) . ')';
+    $args->{term} = @terms ? '(' . join("\n\tOR ", @terms) . ')' : '';
 }
 
 sub _allwordssubstr {
     my ($self, $args) = @_;
 
     my @terms = $self->_substring_terms($args);
-    $args->{term} = '(' . join("\n\tAND ", @terms) . ')';
+    $args->{term} = @terms ? '(' . join("\n\tAND ", @terms) . ')' : '';
 }
 
 sub _nowordssubstr {
@@ -2950,14 +2950,14 @@ sub _anywords {
     # Because _word_terms uses AND, we need to parenthesize its terms
     # if there are more than one.
     @terms = map("($_)", @terms) if scalar(@terms) > 1;
-    $args->{term} = '(' . join("\n\tOR ", @terms) . ')';
+    $args->{term} = @terms ? '(' . join("\n\tOR ", @terms) . ')' : '';
 }
 
 sub _allwords {
     my ($self, $args) = @_;
 
     my @terms = $self->_word_terms($args);
-    $args->{term} = '(' . join("\n\tAND ", @terms) . ')';
+    $args->{term} = @terms ? '(' . join("\n\tAND ", @terms) . ')' : '';
 }
 
 sub _nowords {

From d097e87a862e522fb52b0e573fe4bca98db5bcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 11 Jun 2013 17:57:04 +0200
Subject: [PATCH 108/240] Bug 856158: A question mark inside quoted strings
 triggers flag detection when using QuickSearch r=glob a=LpSolit

---
 Bugzilla/Search/Quicksearch.pm | 46 ++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 3133b1a6b..3048de237 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -363,19 +363,6 @@ sub _handle_special_first_chars {
 sub _handle_field_names {
     my ($or_operand, $negate, $unknownFields, $ambiguous_fields) = @_;
 
-    # Flag and requestee shortcut
-    if ($or_operand =~ /^(?:flag:)?([^\?]+\?)([^\?]*)$/) {
-        my ($flagtype, $requestee) = ($1, $2);
-        addChart('flagtypes.name', 'substring', $flagtype, $negate);
-        if ($requestee) {
-            # AND
-            $chart++;
-            $and = $or = 0;
-            addChart('requestees.login_name', 'substring', $requestee, $negate);
-        }
-        return 1;
-    }
-
     # Generic field1,field2,field3:value1,value2 notation.
     # We have to correctly ignore commas and colons in quotes.
     my @field_values = parse_line(':', 1, $or_operand);
@@ -406,15 +393,48 @@ sub _handle_field_names {
                         $value = $2;
                         $value =~ s/\\(["'])/$1/g;
                     }
+                    # If a requestee is set, we need to handle it separately.
+                    if ($translated eq 'flagtypes.name' && $value =~ /^([^\?]+\?)([^\?]+)$/) {
+                        _handle_flags($1, $2, $negate);
+                        next;
+                    }
                     addChart($translated, $operator, $value, $negate);
                 }
             }
         }
         return 1;
     }
+
+    # Do not look inside quoted strings.
+    return 0 if ($or_operand =~ /^(["']).*\1$/);
+
+    # Flag and requestee shortcut.
+    if ($or_operand =~ /^([^\?]+\?)([^\?]*)$/) {
+        _handle_flags($1, $2, $negate);
+        return 1;
+    }
+
     return 0;
 }
 
+sub _handle_flags {
+    my ($flag, $requestee, $negate) = @_;
+
+    addChart('flagtypes.name', 'substring', $flag, $negate);
+    if ($requestee) {
+        # FIXME - Every time a requestee is involved and you use OR somewhere
+        # in your quick search, the logic will be wrong because boolean charts
+        # are unable to run queries of the form (a AND b) OR c. In our case:
+        # (flag name is foo AND requestee is bar) OR (any other criteria).
+        # But this has never been possible, so this is not a regression. If one
+        # needs to run such queries, he must use the Custom Search section of
+        # the Advanced Search page.
+        $chart++;
+        $and = $or = 0;
+        addChart('requestees.login_name', 'substring', $requestee, $negate);
+    }
+}
+
 sub _translate_field_name {
     my $field = shift;
     $field = lc($field);

From ef219a1c9332e90b7b57422b8c056cc7194d7193 Mon Sep 17 00:00:00 2001
From: Marc Schumann <bugzilla.1.wurblzap@spamgourmet.com>
Date: Tue, 11 Jun 2013 18:15:55 +0200
Subject: [PATCH 109/240] Bug 875377: Hint how to change the email address
 should only be displayed if the address can be changed r/a=LpSolit

---
 template/en/default/account/prefs/email.html.tmpl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index ef8d0ae29..9a5f22a8c 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -28,11 +28,13 @@
   </div>
 [% END %]
 
-<p>
-  If you want to change your e-mail address <b>[% user.email FILTER html %]</b>
-  to which [% terms.Bugzilla %] sends notifications, click the "Account
-  Information" tab above.
-</p>
+[% IF user.authorizer.can_change_email && Param('allowemailchange') %]
+  <p>
+    If you want to change your e-mail address
+    <b>[% user.email FILTER html %]</b> to which [% terms.Bugzilla %] sends
+    notifications, click the "Account Information" tab above.
+  </p>
+[% END %]
 
 <p>
   If you don't like getting a notification for "trivial"

From 9c5e0461e65a523073135e00f32bbf7d53fac677 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 12 Jun 2013 12:17:10 -0400
Subject: [PATCH 110/240] Bug 877083 - "Ignore Bug Mail" shouldn't lead to
 request email being dropped r=glob,a=LpSolit

---
 Bugzilla/Flag.pm                       | 3 ---
 template/en/default/bug/edit.html.tmpl | 8 +++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 0ecc545fd..98029a1b1 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -997,9 +997,6 @@ sub notify {
     }
 
     foreach my $to (keys %recipients) {
-        # Skip sending if user is ignoring the bug.
-        next if ($recipients{$to} && $recipients{$to}->is_bug_ignored($bug->id));
-
         # Add threadingmarker to allow flag notification emails to be the
         # threaded similar to normal bug change emails.
         my $thread_user_id = $recipients{$to} ? $recipients{$to}->id : 0;
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 8d3d76306..933b9ce72 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -833,9 +833,11 @@
       </th>
       <td>
         <input type="hidden" name="defined_bug_ignored" value="1">
-        <input type="checkbox" name="bug_ignored" id="bug_ignored" value="1"
-               [% ' checked="checked"' IF user.is_bug_ignored(bug.id) %]>
-        (never email me about this [% terms.bug %])
+        <span title="You will still receive emails for flag requests directed at you.">
+          <input type="checkbox" name="bug_ignored" id="bug_ignored" value="1"
+                 [% ' checked="checked"' IF user.is_bug_ignored(bug.id) %]>
+          (never email me about this [% terms.bug %])
+        </span>
       </td>
     </tr>
   [% END %]

From d5ec8ce1ada6481504914e1335d8daa1e1db3906 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Mon, 17 Jun 2013 14:26:09 +1000
Subject: [PATCH 111/240] Bug 880097 - Only retrieve database fetched values if
 requested r=glob, a=LpSolit

---
 Bugzilla/WebService/Bug.pm | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index ff6a85582..5522af2bd 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -868,8 +868,6 @@ sub _bug_to_hash {
     # database call to get the info.
     my %item = (
         alias            => $self->type('string', $bug->alias),
-        classification   => $self->type('string', $bug->classification),
-        component        => $self->type('string', $bug->component),
         creation_time    => $self->type('dateTime', $bug->creation_ts),
         # No need to format $bug->deadline specially, because Bugzilla::Bug
         # already does it for us.
@@ -880,7 +878,6 @@ sub _bug_to_hash {
         op_sys           => $self->type('string', $bug->op_sys),
         platform         => $self->type('string', $bug->rep_platform),
         priority         => $self->type('string', $bug->priority),
-        product          => $self->type('string', $bug->product),
         resolution       => $self->type('string', $bug->resolution),
         severity         => $self->type('string', $bug->bug_severity),
         status           => $self->type('string', $bug->bug_status),
@@ -902,6 +899,12 @@ sub _bug_to_hash {
         my @blocks = map { $self->type('int', $_) } @{ $bug->blocked };
         $item{'blocks'} = \@blocks;
     }
+    if (filter_wants $params, 'classification') {
+        $item{classification} = $self->type('string', $bug->classification);
+    }
+    if (filter_wants $params, 'component') {
+        $item{component} = $self->type('string', $bug->component);
+    }
     if (filter_wants $params, 'cc') {
         my @cc = map { $self->type('email', $_) } @{ $bug->cc };
         $item{'cc'} = \@cc;
@@ -929,6 +932,9 @@ sub _bug_to_hash {
                        @{ $bug->keyword_objects };
         $item{'keywords'} = \@keywords;
     }
+    if (filter_wants $params, 'product') {
+        $item{product} = $self->type('string', $bug->product);
+    }
     if (filter_wants $params, 'qa_contact') {
         my $qa_login = $bug->qa_contact ? $bug->qa_contact->login : '';
         $item{'qa_contact'} = $self->type('email', $qa_login);
@@ -968,7 +974,10 @@ sub _bug_to_hash {
     if (Bugzilla->user->is_timetracker) {
         $item{'estimated_time'} = $self->type('double', $bug->estimated_time);
         $item{'remaining_time'} = $self->type('double', $bug->remaining_time);
-        $item{'actual_time'} = $self->type('double', $bug->actual_time);
+
+        if (filter_wants $params, 'actual_time') {
+            $item{'actual_time'} = $self->type('double', $bug->actual_time);
+        }
     }
 
     if (Bugzilla->user->id) {

From 1fe140208958f222ff0912885d75109e4d8b7f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Wed, 26 Jun 2013 00:03:14 +0200
Subject: [PATCH 112/240] Bug 886034: Remove deprecated code about CGI 2.75
 r=dkl a=LpSolit

---
 Bugzilla/Install/Requirements.pm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 66622a7a5..f4c24f038 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -677,13 +677,7 @@ sub have_vers {
     # the module isn't loaded.
     my $vnum = $module->VERSION || -1;
 
-    # CGI's versioning scheme went 2.75, 2.751, 2.752, 2.753, 2.76
-    # That breaks the standard version tests, so we need to manually correct
-    # the version
-    if ($module eq 'CGI' && $vnum =~ /(2\.7\d)(\d+)/) {
-        $vnum = $1 . "." . $2;
-    }
-    # CPAN did a similar thing, where it has versions like 1.9304.
+    # Fix CPAN versions like 1.9304.
     if ($module eq 'CPAN' and $vnum =~ /^(\d\.\d{2})\d{2}$/) {
         $vnum = $1;
     }

From da82f377eb437a3fd830bfa018e657ea4bafd090 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Thu, 27 Jun 2013 12:33:20 +0800
Subject: [PATCH 113/240] Bug 882568: Remove unnecessary text about a bug not
 being part of last search r=dkl, a=LpSolit

---
 template/en/default/bug/navigate.html.tmpl | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index 843c970c1..13564a8ea 100644
--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -21,18 +21,17 @@
     [% Hook.process("links") %]
     <li>&nbsp;-&nbsp;<a href="#">Top of page </a></li>
     </ul>
-[% END %]        
+[% END %]
 
-
-<div class="navigation">
 [% SET my_search = user.recent_search_for(bug) %]
 [% IF my_search %]
+  <div class="navigation">
   [% SET last_bug_list = my_search.bug_list %]
   [% SET this_bug_idx = lsearch(last_bug_list, bug.id) %]
   <b>[% terms.Bug %] List:</b>
 
   ([% this_bug_idx + 1 %] of [% last_bug_list.size %])
-  
+
   [% IF this_bug_idx > 0 %]
     <a href="show_bug.cgi?id=
              [%- last_bug_list.first FILTER uri %]&amp;list_id=
@@ -48,7 +47,7 @@
   [% ELSE %]
     <i><font color="#777777">Last</font></i>
   [% END %]
-  
+
   [% IF this_bug_idx > 0 %]
     [% prev_bug = this_bug_idx - 1 %]
     <a href="show_bug.cgi?id=
@@ -69,14 +68,5 @@
 
   &nbsp;&nbsp;<a href="buglist.cgi?regetlastlist=
               [%- my_search.id FILTER uri %]">Show last search results</a>
-[% ELSE %]
-  [%# With no list, don't show link to search results %]
-  <i><font color="#777777">First</font></i>
-  <i><font color="#777777">Last</font></i>
-  <i><font color="#777777">Prev</font></i>
-  <i><font color="#777777">Next</font></i>
-  &nbsp;&nbsp;
-  <i><font color="#777777">This [% terms.bug %] is not in your last
-    search results.</font></i>
+  </div>
 [% END %]
-</div>

From 55ab3cae35bd86bc92734022a4eb06891355a953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 27 Jun 2013 14:25:09 +0200
Subject: [PATCH 114/240] Remove incorrect linebreak

---
 template/en/default/bug/edit.html.tmpl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 933b9ce72..8a3a6082c 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -273,10 +273,7 @@
     [%############%]    
     <tr>
       [% INCLUDE "bug/field-label.html.tmpl"
-        field = bug_fields.
-        rep_platform editable = 1
-        accesskey = "h"
-      %]
+           field = bug_fields.rep_platform, editable = 1, accesskey = "h" %]
       <td class="field_value">
        [% INCLUDE bug/field.html.tmpl
             bug = bug, field = bug_fields.rep_platform,

From 8b4533c3a4f8195a9e19c214e5890389f5348dc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 27 Jun 2013 23:59:10 +0200
Subject: [PATCH 115/240] Bug 861519: The keyword field in the "Enter Bug" and
 "Change several bugs at once" pages no longer lists available keywords
 a=LpSolit

---
 template/en/default/list/edit-multiple.html.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 962f36f5a..a103a4173 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -214,6 +214,7 @@
       <td colspan="3">
         [% INCLUDE bug/field.html.tmpl
            field = bug_fields.keywords, editable = 1, value = keywords
+           possible_values = all_keywords
            no_tds = 1
         %]
         <select name="keywordaction">

From 2853202c213d63d9fd79ed2906b5e3f5bb5b539e Mon Sep 17 00:00:00 2001
From: John Nishinaga <jingoro@casa-z.org>
Date: Sat, 6 Jul 2013 12:24:14 +0200
Subject: [PATCH 116/240] Bug 890563: DateTime error when going to
 editwhines.cgi r/a=LpSolit

---
 editwhines.cgi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/editwhines.cgi b/editwhines.cgi
index e93e552d9..84a97b877 100755
--- a/editwhines.cgi
+++ b/editwhines.cgi
@@ -25,6 +25,8 @@ use Bugzilla::Whine::Schedule;
 use Bugzilla::Whine::Query;
 use Bugzilla::Whine;
 
+use DateTime;
+
 # require the user to have logged in
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 

From 6f97373a58b0c5df655e9646aaa31b3aa752c4c7 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Tue, 9 Jul 2013 12:48:49 +1000
Subject: [PATCH 117/240] Bug 885646: Bugzilla::BugMail::_get_diff should
 rejoin split activity entries r=glob, a=justdave

---
 Bugzilla/Bug.pm     | 33 ++-------------------------------
 Bugzilla/BugMail.pm | 23 +++++++++++++++++++++--
 Bugzilla/Util.pm    | 38 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index fc704df5e..40acca871 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3942,8 +3942,8 @@ sub get_activity {
                 && ($attachid || 0) == ($operation->{'attachid'} || 0))
             {
                 my $old_change = pop @$changes;
-                $removed = _join_activity_entries($fieldname, $old_change->{'removed'}, $removed);
-                $added = _join_activity_entries($fieldname, $old_change->{'added'}, $added);
+                $removed = join_activity_entries($fieldname, $old_change->{'removed'}, $removed);
+                $added = join_activity_entries($fieldname, $old_change->{'added'}, $added);
             }
             $operation->{'who'} = $who;
             $operation->{'when'} = $when;
@@ -3968,35 +3968,6 @@ sub get_activity {
     return(\@operations, $incomplete_data);
 }
 
-sub _join_activity_entries {
-    my ($field, $current_change, $new_change) = @_;
-    # We need to insert characters as these were removed by old
-    # LogActivityEntry code.
-
-    return $new_change if $current_change eq '';
-
-    # Buglists and see_also need the comma restored
-    if ($field eq 'dependson' || $field eq 'blocked' || $field eq 'see_also') {
-        if (substr($new_change, 0, 1) eq ',' || substr($new_change, 0, 1) eq ' ') {
-            return $current_change . $new_change;
-        } else {
-            return $current_change . ', ' . $new_change;
-        }
-    }
-
-    # Assume bug_file_loc contain a single url, don't insert a delimiter
-    if ($field eq 'bug_file_loc') {
-        return $current_change . $new_change;
-    }
-
-    # All other fields get a space
-    if (substr($new_change, 0, 1) eq ' ') {
-        return $current_change . $new_change;
-    } else {
-        return $current_change . ' ' . $new_change;
-    }
-}
-
 # Update the bugs_activity table to reflect changes made in bugs.
 sub LogActivityEntry {
     my ($i, $col, $removed, $added, $whoid, $timestamp, $comment_id) = @_;
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 68962fc66..ee25613b7 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -416,7 +416,8 @@ sub _get_diffs {
                 ON fielddefs.id = bugs_activity.fieldid
              WHERE bugs_activity.bug_id = ?
                    $when_restriction
-          ORDER BY bugs_activity.bug_when", {Slice=>{}}, @args);
+          ORDER BY bugs_activity.bug_when, bugs_activity.id",
+        {Slice=>{}}, @args);
 
     foreach my $diff (@$diffs) {
         $user_cache->{$diff->{who}} ||= new Bugzilla::User($diff->{who}); 
@@ -433,7 +434,25 @@ sub _get_diffs {
          }
     }
 
-    return @$diffs;
+    my @changes = ();
+    foreach my $diff (@$diffs) {
+        # If this is the same field as the previous item, then concatenate
+        # the data into the same change.
+        if (scalar(@changes)
+            && $diff->{field_name}        eq $changes[-1]->{field_name}
+            && $diff->{bug_when}          eq $changes[-1]->{bug_when}
+            && $diff->{who}               eq $changes[-1]->{who}
+            && ($diff->{attach_id} // 0)  == ($changes[-1]->{attach_id} // 0)
+            && ($diff->{comment_id} // 0) == ($changes[-1]->{comment_id} // 0)
+        ) {
+            my $old_change = pop @changes;
+            $diff->{old} = join_activity_entries($diff->{field_name}, $old_change->{old}, $diff->{old});
+            $diff->{new} = join_activity_entries($diff->{field_name}, $old_change->{new}, $diff->{new});
+        }
+        push @changes, $diff;
+    }
+
+    return @changes;
 }
 
 sub _get_new_bugmail_fields {
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index cee12ee21..58d6ab365 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -22,7 +22,8 @@ use parent qw(Exporter);
                              is_7bit_clean bz_crypt generate_random_password
                              validate_email_syntax check_email_syntax clean_text
                              get_text template_var disable_utf8
-                             detect_encoding email_filter);
+                             detect_encoding email_filter
+                             join_activity_entries);
 
 use Bugzilla::Constants;
 use Bugzilla::RNG qw(irand);
@@ -464,6 +465,35 @@ sub find_wrap_point {
     return $wrappoint;
 }
 
+sub join_activity_entries {
+    my ($field, $current_change, $new_change) = @_;
+    # We need to insert characters as these were removed by old
+    # LogActivityEntry code.
+
+    return $new_change if $current_change eq '';
+
+    # Buglists and see_also need the comma restored
+    if ($field eq 'dependson' || $field eq 'blocked' || $field eq 'see_also') {
+        if (substr($new_change, 0, 1) eq ',' || substr($new_change, 0, 1) eq ' ') {
+            return $current_change . $new_change;
+        } else {
+            return $current_change . ', ' . $new_change;
+        }
+    }
+
+    # Assume bug_file_loc contain a single url, don't insert a delimiter
+    if ($field eq 'bug_file_loc') {
+        return $current_change . $new_change;
+    }
+
+    # All other fields get a space
+    if (substr($new_change, 0, 1) eq ' ') {
+        return $current_change . $new_change;
+    } else {
+        return $current_change . ' ' . $new_change;
+    }
+}
+
 sub wrap_hard {
     my ($string, $columns) = @_;
     local $Text::Wrap::columns = $columns;
@@ -1012,6 +1042,12 @@ Search for a comma, a whitespace or a hyphen to split $string, within the first
 $maxpos characters. If none of them is found, just split $string at $maxpos.
 The search starts at $maxpos and goes back to the beginning of the string.
 
+=item C<join_activity_entries($field, $current_change, $new_change)>
+
+Joins two strings together so they appear as one. The field name is specified
+as the method of joining the two strings depends on this. Returns the
+combined string.
+
 =item C<is_7bit_clean($str)>
 
 Returns true is the string contains only 7-bit characters (ASCII 32 through 126,

From 44d42898e8d7c07161a9136ad5d3b9b9fb60bc0a Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 12 Jul 2013 16:39:50 -0400
Subject: [PATCH 118/240] Bug 866927 - Enhance Bugzilla WebServices to allow
 data access using REST r=glob,a=justdave

---
 .htaccess                                     |   6 +
 Bugzilla.pm                                   |   3 +
 Bugzilla/CGI.pm                               |   2 +-
 Bugzilla/Constants.pm                         |   4 +
 Bugzilla/Error.pm                             |  18 +-
 Bugzilla/Install/Requirements.pm              |   5 +-
 Bugzilla/Mailer.pm                            |   2 +
 Bugzilla/WebService.pm                        |  25 +-
 Bugzilla/WebService/Bug.pm                    | 149 ++++-
 Bugzilla/WebService/Bugzilla.pm               |  74 ++-
 Bugzilla/WebService/Classification.pm         |  22 +-
 Bugzilla/WebService/Constants.pm              |  63 +-
 Bugzilla/WebService/Group.pm                  |  45 +-
 Bugzilla/WebService/Product.pm                |  85 ++-
 Bugzilla/WebService/Server/REST.pm            | 617 ++++++++++++++++++
 .../WebService/Server/REST/Resources/Bug.pm   | 152 +++++
 .../Server/REST/Resources/Bugzilla.pm         |  69 ++
 .../Server/REST/Resources/Classification.pm   |  49 ++
 .../WebService/Server/REST/Resources/Group.pm |  56 ++
 .../Server/REST/Resources/Product.pm          |  75 +++
 .../WebService/Server/REST/Resources/User.pm  |  65 ++
 Bugzilla/WebService/User.pm                   |  47 +-
 rest.cgi                                      |  29 +
 .../en/default/global/user-error.html.tmpl    |   7 +
 template/en/default/rest.html.tmpl            |  19 +
 25 files changed, 1649 insertions(+), 39 deletions(-)
 create mode 100644 Bugzilla/WebService/Server/REST.pm
 create mode 100644 Bugzilla/WebService/Server/REST/Resources/Bug.pm
 create mode 100644 Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm
 create mode 100644 Bugzilla/WebService/Server/REST/Resources/Classification.pm
 create mode 100644 Bugzilla/WebService/Server/REST/Resources/Group.pm
 create mode 100644 Bugzilla/WebService/Server/REST/Resources/Product.pm
 create mode 100644 Bugzilla/WebService/Server/REST/Resources/User.pm
 create mode 100755 rest.cgi
 create mode 100644 template/en/default/rest.html.tmpl

diff --git a/.htaccess b/.htaccess
index 3b464a475..4ec921b2c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -26,3 +26,9 @@ Options -Indexes
 </IfModule>
 </IfModule>
 </IfModule>
+
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+RewriteBase /866927/
+  RewriteRule ^rest/(.*)$ rest.cgi/$1 [NE]
+</IfModule>
diff --git a/Bugzilla.pm b/Bugzilla.pm
index 6331c60fe..eb1c2f8ea 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -469,6 +469,9 @@ sub usage_mode {
         elsif ($newval == USAGE_MODE_TEST) {
             $class->error_mode(ERROR_MODE_TEST);
         }
+        elsif ($newval == USAGE_MODE_REST) {
+            $class->error_mode(ERROR_MODE_REST);
+        }
         else {
             ThrowCodeError('usage_mode_invalid',
                            {'invalid_usage_mode', $newval});
diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 513babd4f..dacd900a0 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -56,7 +56,7 @@ sub new {
     # the rendering of pages.
     my $script = basename($0);
     if (my $path_info = $self->path_info) {
-        my @whitelist;
+        my @whitelist = ("rest.cgi");
         Bugzilla::Hook::process('path_info_whitelist', { whitelist => \@whitelist });
         if (!grep($_ eq $script, @whitelist)) {
             # IIS includes the full path to the script in PATH_INFO,
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 765dacd99..4580d56b7 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -122,12 +122,14 @@ use Memoize;
     USAGE_MODE_EMAIL
     USAGE_MODE_JSON
     USAGE_MODE_TEST
+    USAGE_MODE_REST
 
     ERROR_MODE_WEBPAGE
     ERROR_MODE_DIE
     ERROR_MODE_DIE_SOAP_FAULT
     ERROR_MODE_JSON_RPC
     ERROR_MODE_TEST
+    ERROR_MODE_REST
 
     COLOR_ERROR
     COLOR_SUCCESS
@@ -459,6 +461,7 @@ use constant USAGE_MODE_XMLRPC     => 2;
 use constant USAGE_MODE_EMAIL      => 3;
 use constant USAGE_MODE_JSON       => 4;
 use constant USAGE_MODE_TEST       => 5;
+use constant USAGE_MODE_REST       => 6;
 
 # Error modes. Default set by Bugzilla->usage_mode (so ERROR_MODE_WEBPAGE
 # usually). Use with Bugzilla->error_mode.
@@ -467,6 +470,7 @@ use constant ERROR_MODE_DIE            => 1;
 use constant ERROR_MODE_DIE_SOAP_FAULT => 2;
 use constant ERROR_MODE_JSON_RPC       => 3;
 use constant ERROR_MODE_TEST           => 4;
+use constant ERROR_MODE_REST           => 5;
 
 # The ANSI colors of messages that command-line scripts use
 use constant COLOR_ERROR => 'red';
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index d64219e87..ee84183b1 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -104,7 +104,8 @@ sub _throw_error {
         die("$message\n");
     }
     elsif (Bugzilla->error_mode == ERROR_MODE_DIE_SOAP_FAULT
-           || Bugzilla->error_mode == ERROR_MODE_JSON_RPC)
+           || Bugzilla->error_mode == ERROR_MODE_JSON_RPC
+           || Bugzilla->error_mode == ERROR_MODE_REST)
     {
         # Clone the hash so we aren't modifying the constant.
         my %error_map = %{ WS_ERROR_CODE() };
@@ -121,13 +122,20 @@ sub _throw_error {
         }
         else {
             my $server = Bugzilla->_json_server;
+
+            my $status_code = 0;
+            if (Bugzilla->error_mode == ERROR_MODE_REST) {
+                my %status_code_map = %{ REST_STATUS_CODE_MAP() };
+                $status_code = $status_code_map{$code} || $status_code_map{'_default'};
+            }
             # Technically JSON-RPC isn't allowed to have error numbers
             # higher than 999, but we do this to avoid conflicts with
             # the internal JSON::RPC error codes.
-            $server->raise_error(code    => 100000 + $code,
-                                 message => $message,
-                                 id      => $server->{_bz_request_id},
-                                 version => $server->version);
+            $server->raise_error(code        => 100000 + $code,
+                                 status_code => $status_code,
+                                 message     => $message,
+                                 id          => $server->{_bz_request_id},
+                                 version     => $server->version);
             # Most JSON-RPC Throw*Error calls happen within an eval inside
             # of JSON::RPC. So, in that circumstance, instead of exiting,
             # we die with no message. JSON::RPC checks raise_error before
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index f4c24f038..4b59838f8 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -284,7 +284,7 @@ sub OPTIONAL_MODULES {
         package => 'JSON-RPC',
         module  => 'JSON::RPC',
         version => 0,
-        feature => ['jsonrpc'],
+        feature => ['jsonrpc', 'rest'],
     },
     {
         package => 'JSON-XS',
@@ -298,7 +298,7 @@ sub OPTIONAL_MODULES {
         module  => 'Test::Taint',
         # 1.06 no longer throws warnings with Perl 5.10+.
         version => 1.06,
-        feature => ['jsonrpc', 'xmlrpc'],
+        feature => ['jsonrpc', 'xmlrpc', 'rest'],
     },
     {
         # We need the 'utf8_mode' method of HTML::Parser, for HTML::Scrubber.
@@ -397,6 +397,7 @@ use constant FEATURE_FILES => (
     jsonrpc       => ['Bugzilla/WebService/Server/JSONRPC.pm', 'jsonrpc.cgi'],
     xmlrpc        => ['Bugzilla/WebService/Server/XMLRPC.pm', 'xmlrpc.cgi',
                       'Bugzilla/WebService.pm', 'Bugzilla/WebService/*.pm'],
+    rest          => ['Bugzilla/WebService/Server/REST.pm', 'rest.cgi'],
     moving        => ['importxml.pl'],
     auth_ldap     => ['Bugzilla/Auth/Verify/LDAP.pm'],
     auth_radius   => ['Bugzilla/Auth/Verify/RADIUS.pm'],
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 6602c6cef..b60ddb72e 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -136,6 +136,8 @@ sub MessageToMTA {
     Bugzilla::Hook::process('mailer_before_send', 
                             { email => $email, mailer_args => \@args });
 
+    return if $email->header('to') eq '';
+
     $email->walk_parts(sub {
         my ($part) = @_;
         return if $part->parts > 1; # Top-level
diff --git a/Bugzilla/WebService.pm b/Bugzilla/WebService.pm
index 5b2825375..03548d257 100644
--- a/Bugzilla/WebService.pm
+++ b/Bugzilla/WebService.pm
@@ -45,15 +45,20 @@ This is the standard API for external programs that want to interact
 with Bugzilla. It provides various methods in various modules.
 
 You can interact with this API via
-L<XML-RPC|Bugzilla::WebService::Server::XMLRPC> or
-L<JSON-RPC|Bugzilla::WebService::Server::JSONRPC>.
+L<XML-RPC|Bugzilla::WebService::Server::XMLRPC>,
+L<JSON-RPC|Bugzilla::WebService::Server::JSONRPC> or
+L<REST|Bugzilla::WebService::Server::REST>.
 
 =head1 CALLING METHODS
 
-Methods are grouped into "packages", like C<Bug> for 
+Methods are grouped into "packages", like C<Bug> for
 L<Bugzilla::WebService::Bug>. So, for example,
 L<Bugzilla::WebService::Bug/get>, is called as C<Bug.get>.
 
+For REST, the "package" is more determined by the path
+used to access the resource. See each relevant method
+for specific details on how to access via REST.
+
 =head1 PARAMETERS
 
 The Bugzilla API takes the following various types of parameters:
@@ -135,7 +140,7 @@ There are various ways to log in:
 
 =item C<User.login>
 
-You can use L<Bugzilla::WebService::User/login> to log in as a Bugzilla 
+You can use L<Bugzilla::WebService::User/login> to log in as a Bugzilla
 user. This issues standard HTTP cookies that you must then use in future
 calls, so your client must be capable of receiving and transmitting
 cookies.
@@ -165,13 +170,17 @@ not expire.
 =back
 
 The C<Bugzilla_restrictlogin> and C<Bugzilla_rememberlogin> options
-are only used when you have also specified C<Bugzilla_login> and 
+are only used when you have also specified C<Bugzilla_login> and
 C<Bugzilla_password>.
 
 Note that Bugzilla will return HTTP cookies along with the method
 response when you use these arguments (just like the C<User.login> method
 above).
 
+For REST, you may also use the C<username> and C<password> variable
+names instead of C<Bugzilla_login> and C<Bugzilla_password> as a
+convenience.
+
 =back
 
 =head1 STABLE, EXPERIMENTAL, and UNSTABLE
@@ -266,6 +275,9 @@ would return something like:
 
   { users => [{ id => 1, name => 'user@domain.com' }] }
 
+Note for REST, C<include_fields> may instead be a comma delimited string
+for GET type requests.
+
 =item C<exclude_fields>
 
 C<array> An array of strings, representing the (case-sensitive) names of
@@ -295,6 +307,9 @@ would return something like:
 
   { users => [{ id => 1, real_name => 'John Smith' }] }
 
+Note for REST, C<exclude_fields> may instead be a comma delimited string
+for GET type requests.
+
 =back
 
 =head1 SEE ALSO
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 5522af2bd..391ea69bc 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -1075,6 +1075,10 @@ or get information about bugs that have already been filed.
 See L<Bugzilla::WebService> for a description of how parameters are passed,
 and what B<STABLE>, B<UNSTABLE>, and B<EXPERIMENTAL> mean.
 
+Although the data input and output is the same for JSONRPC, XMLRPC and REST,
+the directions for how to access the data via REST is noted in each method
+where applicable.
+
 =head1 Utility Functions
 
 =head2 fields
@@ -1088,11 +1092,26 @@ B<UNSTABLE>
 Get information about valid bug fields, including the lists of legal values
 for each field.
 
+=item B<REST>
+
+You have several options for retreiving information about fields. The first
+part is the request method and the rest is the related path needed.
+
+To get information about all fields:
+
+GET /field/bug
+
+To get information related to a single field:
+
+GET /field/bug/<id_or_name>
+
+The returned data format is the same as below.
+
 =item B<Params>
 
 You can pass either field ids or field names.
 
-B<Note>: If neither C<ids> nor C<names> is specified, then all 
+B<Note>: If neither C<ids> nor C<names> is specified, then all
 non-obsolete fields will be returned.
 
 In addition to the parameters below, this method also accepts the
@@ -1288,6 +1307,8 @@ You specified an invalid field name or id.
 
 =item C<is_active> return key for C<values> was added in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>
+
 =back
 
 =back
@@ -1303,6 +1324,18 @@ B<DEPRECATED> - Use L</fields> instead.
 
 Tells you what values are allowed for a particular field.
 
+=item B<REST>
+
+To get information on the values for a field based on field name:
+
+GET /field/bug/<field_name>/values
+
+To get information based on field name and a specific product:
+
+GET /field/bug/<field_name>/<product_id>/values
+
+The returned data format is the same as below.
+
 =item B<Params>
 
 =over
@@ -1335,6 +1368,14 @@ You specified a field that doesn't exist or isn't a drop-down field.
 
 =back
 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
 =back
 
 =head1 Bug Information
@@ -1353,6 +1394,18 @@ and/or attachment ids.
 B<Note>: Private attachments will only be returned if you are in the 
 insidergroup or if you are the submitter of the attachment.
 
+=item B<REST>
+
+To get all current attachments for a bug:
+
+GET /bug/<bug_id>/attachment
+
+To get a specific attachment based on attachment ID:
+
+GET /bug/attachment/<attachment_id>
+
+The returned data format is the same as below.
+
 =item B<Params>
 
 B<Note>: At least one of C<ids> or C<attachment_ids> is required.
@@ -1550,6 +1603,8 @@ C<summary>.
 
 =item The C<flags> array was added in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -1566,6 +1621,18 @@ B<STABLE>
 This allows you to get data about comments, given a list of bugs 
 and/or comment ids.
 
+=item B<REST>
+
+To get all comments for a particular bug using the bug ID or alias:
+
+GET /bug/<id_or_alias>/comment
+
+To get a specific comment based on the comment ID:
+
+GET /bug/comment/<comment_id>
+
+The returned data format is the same as below.
+
 =item B<Params>
 
 B<Note>: At least one of C<ids> or C<comment_ids> is required.
@@ -1711,6 +1778,8 @@ C<creator>.
 
 =item C<creation_time> was added in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -1728,6 +1797,14 @@ Gets information about particular bugs in the database.
 
 Note: Can also be called as "get_bugs" for compatibilty with Bugzilla 3.0 API.
 
+=item B<REST>
+
+To get information about a particular bug using its ID or alias:
+
+GET /bug/<id_or_alias>
+
+The returned data format is the same as below.
+
 =item B<Params>
 
 In addition to the parameters below, this method also accepts the
@@ -2060,6 +2137,8 @@ You do not have access to the bug_id you specified.
 =item The following properties were added to this method's return values
 in Bugzilla B<3.4>:
 
+=item REST API call added in Bugzilla B<5.0>
+
 =over
 
 =item For C<bugs>
@@ -2117,6 +2196,14 @@ B<EXPERIMENTAL>
 
 Gets the history of changes for particular bugs in the database.
 
+=item B<REST>
+
+To get the history for a specific bug ID:
+
+GET /bug/<bug_id>/history
+
+The returned data format will be the same as below.
+
 =item B<Params>
 
 =over
@@ -2208,6 +2295,8 @@ The same as L</get>.
 consistent with other methods. Since Bugzilla B<4.4>, they now match
 names used by L<Bug.update|/"update"> for consistency.
 
+=item REST API call added Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -2223,6 +2312,14 @@ B<UNSTABLE>
 
 Allows you to search for bugs based on particular criteria.
 
+=item <REST>
+
+To search for bugs:
+
+GET /bug
+
+The URL parameters and the returned data format are the same as below.
+
 =item B<Params>
 
 Unless otherwise specified in the description of a parameter, bugs are
@@ -2408,6 +2505,8 @@ in Bugzilla B<4.0>.
 C<limit> is set equal to zero. Otherwise maximum results returned are limited
 by system configuration.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -2434,10 +2533,19 @@ The WebService interface may allow you to set things other than those listed
 here, but realize that anything undocumented is B<UNSTABLE> and will very
 likely change in the future.
 
+=item B<REST>
+
+To create a new bug in Bugzilla:
+
+POST /bug
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
 =item B<Params>
 
 Some params must be set, or an error will be thrown. These params are
-marked B<Required>. 
+marked B<Required>.
 
 Some parameters can have defaults set in Bugzilla, by the administrator.
 If these parameters have defaults set, you can omit them. These parameters
@@ -2598,6 +2706,8 @@ loop errors had a generic code of C<32000>.
 =item The ability to file new bugs with a C<resolution> was added in
 Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -2613,6 +2723,16 @@ B<STABLE>
 
 This allows you to add an attachment to a bug in Bugzilla.
 
+=item B<REST>
+
+To create attachment on a current bug:
+
+POST /bug/<bug_id>/attachment
+
+The params to include in the POST body, as well as the returned
+data format are the same as below. The C<ids> param will be
+overridden as it it pulled from the URL path.
+
 =item B<Params>
 
 =over
@@ -2710,6 +2830,8 @@ You set the "data" field to an empty string.
 
 =item The return value has changed in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -2725,6 +2847,15 @@ B<STABLE>
 
 This allows you to add a comment to a bug in Bugzilla.
 
+=item B<REST>
+
+To create a comment on a current bug:
+
+POST /bug/<bug_id>/comment
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
 =item B<Params>
 
 =over
@@ -2800,6 +2931,8 @@ purposes if you wish.
 =item Before Bugzilla B<3.6>, error 54 and error 114 had a generic error
 code of 32000.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -2816,6 +2949,16 @@ B<UNSTABLE>
 Allows you to update the fields of a bug. Automatically sends emails
 out about the changes.
 
+=item B<REST>
+
+To update the fields of a current bug:
+
+PUT /bug/<bug_id>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> param will be overridden as it is
+pulled from the URL path.
+
 =item B<Params>
 
 =over
@@ -3260,6 +3403,8 @@ rules don't allow that change.
 
 =item Added in Bugzilla B<4.0>.
 
+=item REST API call added Bugzilla B<5.0>.
+
 =back
 
 =back
diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm
index 6fd7a023a..10ba38bab 100644
--- a/Bugzilla/WebService/Bugzilla.pm
+++ b/Bugzilla/WebService/Bugzilla.pm
@@ -121,12 +121,12 @@ sub time {
 sub last_audit_time {
     my ($self, $params) = validate(@_, 'class');
     my $dbh = Bugzilla->dbh;
-    
+
     my $sql_statement = "SELECT MAX(at_time) FROM audit_log";
     my $class_values =  $params->{class};
     my @class_values_quoted;
     foreach my $class_value (@$class_values) {
-        push (@class_values_quoted, $dbh->quote($class_value)) 
+        push (@class_values_quoted, $dbh->quote($class_value))
             if $class_value =~ /^Bugzilla(::[a-zA-Z0-9_]+)*$/;
     }
 
@@ -135,11 +135,11 @@ sub last_audit_time {
     }
 
     my $last_audit_time = $dbh->selectrow_array("$sql_statement");
- 
+
     # All Webservices return times in UTC; Use UTC here for backwards compat.
     # Hardcode values where appropriate
     $last_audit_time = datetime_from($last_audit_time, 'UTC');
-    
+
     return {
         last_audit_time => $self->type('dateTime', $last_audit_time)
     };
@@ -181,6 +181,10 @@ This provides functions that tell you about Bugzilla in general.
 See L<Bugzilla::WebService> for a description of how parameters are passed,
 and what B<STABLE>, B<UNSTABLE>, and B<EXPERIMENTAL> mean.
 
+Although the data input and output is the same for JSONRPC, XMLRPC and REST,
+the directions for how to access the data via REST is noted in each method
+where applicable.
+
 =head2 version
 
 B<STABLE>
@@ -191,6 +195,12 @@ B<STABLE>
 
 Returns the current version of Bugzilla.
 
+=item B<REST>
+
+GET /version
+
+The returned data format is the same as below.
+
 =item B<Params> (none)
 
 =item B<Returns>
@@ -200,6 +210,14 @@ string.
 
 =item B<Errors> (none)
 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
 =back
 
 =head2 extensions
@@ -213,6 +231,12 @@ B<EXPERIMENTAL>
 Gets information about the extensions that are currently installed and enabled
 in this Bugzilla.
 
+=item B<REST>
+
+GET /extensions
+
+The returned data format is the same as below.
+
 =item B<Params> (none)
 
 =item B<Returns>
@@ -243,6 +267,8 @@ The return value looks something like this:
 that the extensions define themselves. Before 3.6, the names of the
 extensions depended on the directory they were in on the Bugzilla server.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -258,6 +284,12 @@ Use L</time> instead.
 
 Returns the timezone that Bugzilla expects dates and times in.
 
+=item B<REST>
+
+GET /timezone
+
+The returned data format is the same as below.
+
 =item B<Params> (none)
 
 =item B<Returns>
@@ -272,6 +304,8 @@ string in (+/-)XXXX (RFC 2822) format.
 =item As of Bugzilla B<3.6>, the timezone returned is always C<+0000>
 (the UTC timezone).
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -288,6 +322,12 @@ B<STABLE>
 Gets information about what time the Bugzilla server thinks it is, and
 what timezone it's running in.
 
+=item B<REST>
+
+GET /time
+
+The returned data format is the same as below.
+
 =item B<Params> (none)
 
 =item B<Returns>
@@ -298,7 +338,7 @@ A struct with the following items:
 
 =item C<db_time>
 
-C<dateTime> The current time in UTC, according to the Bugzilla 
+C<dateTime> The current time in UTC, according to the Bugzilla
 I<database server>.
 
 Note that Bugzilla assumes that the database and the webserver are running
@@ -308,7 +348,7 @@ rely on for doing searches and other input to the WebService.
 
 =item C<web_time>
 
-C<dateTime> This is the current time in UTC, according to Bugzilla's 
+C<dateTime> This is the current time in UTC, according to Bugzilla's
 I<web server>.
 
 This might be different by a second from C<db_time> since this comes from
@@ -324,7 +364,7 @@ versions of Bugzilla before 3.6.)
 =item C<tz_name>
 
 C<string> The literal string C<UTC>. (Exists only for backwards-compatibility
-with versions of Bugzilla before 3.6.) 
+with versions of Bugzilla before 3.6.)
 
 =item C<tz_short_name>
 
@@ -348,6 +388,8 @@ with versions of Bugzilla before 3.6.)
 were in the UTC timezone, instead of returning information in the server's
 local timezone.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -362,6 +404,12 @@ B<UNSTABLE>
 
 Returns parameter values currently used in this Bugzilla.
 
+=item B<REST>
+
+GET /parameters
+
+The returned data format is the same as below.
+
 =item B<Params> (none)
 
 =item B<Returns>
@@ -419,6 +467,8 @@ never be stable.
 
 =item Added in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -433,9 +483,15 @@ B<EXPERIMENTAL>
 
 Gets the latest time of the audit_log table.
 
+=item B<REST>
+
+GET /last_audit_time
+
+The returned data format is the same as below.
+
 =item B<Params>
 
-You can pass the optional parameter C<class> to get the maximum for only 
+You can pass the optional parameter C<class> to get the maximum for only
 the listed classes.
 
 =over
@@ -460,6 +516,8 @@ at_time from the audit_log.
 
 =item Added in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
diff --git a/Bugzilla/WebService/Classification.pm b/Bugzilla/WebService/Classification.pm
index c104994a5..22358c784 100644
--- a/Bugzilla/WebService/Classification.pm
+++ b/Bugzilla/WebService/Classification.pm
@@ -86,7 +86,7 @@ Bugzilla::Webservice::Classification - The Classification API
 
 =head1 DESCRIPTION
 
-This part of the Bugzilla API allows you to deal with the available Classifications. 
+This part of the Bugzilla API allows you to deal with the available Classifications.
 You will be able to get information about them as well as manipulate them.
 
 =head1 METHODS
@@ -94,6 +94,10 @@ You will be able to get information about them as well as manipulate them.
 See L<Bugzilla::WebService> for a description of how parameters are passed,
 and what B<STABLE>, B<UNSTABLE>, and B<EXPERIMENTAL> mean.
 
+Although the data input and output is the same for JSONRPC, XMLRPC and REST,
+the directions for how to access the data via REST is noted in each method
+where applicable.
+
 =head1 Classification Retrieval
 
 =head2 get
@@ -106,13 +110,21 @@ B<EXPERIMENTAL>
 
 Returns a hash containing information about a set of classifications.
 
+=item B<REST>
+
+To return information on a single classification:
+
+GET /classification/<classification_id_or_name>
+
+The returned data format will be the same as below.
+
 =item B<Params>
 
 In addition to the parameters below, this method also accepts the
 standard L<include_fields|Bugzilla::WebService/include_fields> and
 L<exclude_fields|Bugzilla::WebService/exclude_fields> arguments.
 
-You could get classifications info by supplying their names and/or ids. 
+You could get classifications info by supplying their names and/or ids.
 So, this method accepts the following parameters:
 
 =over
@@ -127,10 +139,10 @@ An array of classification names.
 
 =back
 
-=item B<Returns>    
+=item B<Returns>
 
 A hash with the key C<classifications> and an array of hashes as the corresponding value.
-Each element of the array represents a classification that the user is authorized to see 
+Each element of the array represents a classification that the user is authorized to see
 and has the following keys:
 
 =over
@@ -190,6 +202,8 @@ Classification is not enabled on this installation.
 
 =item Added in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm
index b1503772e..e4325d9d3 100644
--- a/Bugzilla/WebService/Constants.pm
+++ b/Bugzilla/WebService/Constants.pm
@@ -14,9 +14,22 @@ use parent qw(Exporter);
 
 our @EXPORT = qw(
     WS_ERROR_CODE
+
+    STATUS_OK
+    STATUS_CREATED
+    STATUS_ACCEPTED
+    STATUS_NO_CONTENT
+    STATUS_MULTIPLE_CHOICES
+    STATUS_BAD_REQUEST
+    STATUS_NOT_FOUND
+    STATUS_GONE
+    REST_STATUS_CODE_MAP
+
     ERROR_UNKNOWN_FATAL
     ERROR_UNKNOWN_TRANSIENT
+
     XMLRPC_CONTENT_TYPE_WHITELIST
+    REST_CONTENT_TYPE_WHITELIST
 
     WS_DISPATCH
 );
@@ -172,8 +185,47 @@ use constant WS_ERROR_CODE => {
     unknown_method       => -32601,
     json_rpc_post_only   => 32610,
     json_rpc_invalid_callback => 32611,
-    xmlrpc_illegal_content_type   => 32612, 
-    json_rpc_illegal_content_type => 32613, 
+    xmlrpc_illegal_content_type   => 32612,
+    json_rpc_illegal_content_type => 32613,
+    rest_invalid_resource         => 32614,
+};
+
+# RESTful webservices use the http status code
+# to describe whether a call was successful or
+# to describe the type of error that occurred.
+use constant STATUS_OK               => 200;
+use constant STATUS_CREATED          => 201;
+use constant STATUS_ACCEPTED         => 202;
+use constant STATUS_NO_CONTENT       => 204;
+use constant STATUS_MULTIPLE_CHOICES => 300;
+use constant STATUS_BAD_REQUEST      => 400;
+use constant STATUS_NOT_AUTHORIZED   => 401;
+use constant STATUS_NOT_FOUND        => 404;
+use constant STATUS_GONE             => 410;
+
+# The integer value is the error code above returned by
+# the related webvservice call. We choose the appropriate
+# http status code based on the error code or use the
+# default STATUS_BAD_REQUEST.
+use constant REST_STATUS_CODE_MAP => {
+    51       => STATUS_NOT_FOUND,
+    101      => STATUS_NOT_FOUND,
+    102      => STATUS_NOT_AUTHORIZED,
+    106      => STATUS_NOT_AUTHORIZED,
+    109      => STATUS_NOT_AUTHORIZED,
+    110      => STATUS_NOT_AUTHORIZED,
+    113      => STATUS_NOT_AUTHORIZED,
+    115      => STATUS_NOT_AUTHORIZED,
+    120      => STATUS_NOT_AUTHORIZED,
+    300      => STATUS_NOT_AUTHORIZED,
+    301      => STATUS_NOT_AUTHORIZED,
+    302      => STATUS_NOT_AUTHORIZED,
+    303      => STATUS_NOT_AUTHORIZED,
+    304      => STATUS_NOT_AUTHORIZED,
+    410      => STATUS_NOT_AUTHORIZED,
+    504      => STATUS_NOT_AUTHORIZED,
+    505      => STATUS_NOT_AUTHORIZED,
+    _default => STATUS_BAD_REQUEST
 };
 
 # These are the fallback defaults for errors not in ERROR_CODE.
@@ -187,6 +239,13 @@ use constant XMLRPC_CONTENT_TYPE_WHITELIST => qw(
     application/xml
 );
 
+use constant REST_CONTENT_TYPE_WHITELIST => qw(
+    text/html
+    application/javascript
+    application/json
+    text/javascript
+);
+
 sub WS_DISPATCH {
     # We "require" here instead of "use" above to avoid a dependency loop.
     require Bugzilla::Hook;
diff --git a/Bugzilla/WebService/Group.pm b/Bugzilla/WebService/Group.pm
index e9aa405f6..2d6689880 100644
--- a/Bugzilla/WebService/Group.pm
+++ b/Bugzilla/WebService/Group.pm
@@ -113,6 +113,10 @@ get information about them.
 See L<Bugzilla::WebService> for a description of how parameters are passed,
 and what B<STABLE>, B<UNSTABLE>, and B<EXPERIMENTAL> mean.
 
+Although the data input and output is the same for JSONRPC, XMLRPC and REST,
+the directions for how to access the data via REST is noted in each method
+where applicable.
+
 =head1 Group Creation and Modification
 
 =head2 create
@@ -125,9 +129,16 @@ B<UNSTABLE>
 
 This allows you to create a new group in Bugzilla.
 
-=item B<Params> 
+=item B<REST>
 
-Some params must be set, or an error will be thrown. These params are 
+POST /group
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+Some params must be set, or an error will be thrown. These params are
 marked B<Required>.
 
 =over
@@ -148,7 +159,7 @@ name of the group.
 C<string> A regular expression. Any user whose Bugzilla username matches
 this regular expression will automatically be granted membership in this group.
 
-=item C<is_active> 
+=item C<is_active>
 
 C<boolean> C<True> if new group can be used for bugs, C<False> if this
 is a group that will only contain users and no bugs will be restricted
@@ -162,7 +173,7 @@ if they are in this group.
 
 =back
 
-=item B<Returns>    
+=item B<Returns>
 
 A hash with one element, C<id>. This is the id of the newly-created group.
 
@@ -188,7 +199,15 @@ You specified an invalid regular expression in the C<user_regexp> field.
 
 =back
 
-=back 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
 
 =head2 update
 
@@ -200,6 +219,14 @@ B<UNSTABLE>
 
 This allows you to update a group in Bugzilla.
 
+=item B<REST>
+
+PUT /group/<group_name_or_id>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> param will be overridden as it is pulled
+from the URL path.
+
 =item B<Params>
 
 At least C<ids> or C<names> must be set, or an error will be thrown.
@@ -278,6 +305,14 @@ comma-and-space-separated list if multiple values were removed.
 
 The same as L</create>.
 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
 =back
 
 =cut
diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm
index 755477acf..83a6583fa 100644
--- a/Bugzilla/WebService/Product.pm
+++ b/Bugzilla/WebService/Product.pm
@@ -336,6 +336,10 @@ get information about them.
 See L<Bugzilla::WebService> for a description of how parameters are passed,
 and what B<STABLE>, B<UNSTABLE>, and B<EXPERIMENTAL> mean.
 
+Although the data input and output is the same for JSONRPC, XMLRPC and REST,
+the directions for how to access the data via REST is noted in each method
+where applicable.
+
 =head1 List Products
 
 =head2 get_selectable_products
@@ -348,15 +352,29 @@ B<EXPERIMENTAL>
 
 Returns a list of the ids of the products the user can search on.
 
+=item B<REST>
+
+GET /product?type=selectable
+
+the returned data format is same as below.
+
 =item B<Params> (none)
 
-=item B<Returns>    
+=item B<Returns>
 
 A hash containing one item, C<ids>, that contains an array of product
 ids.
 
 =item B<Errors> (none)
 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
 =back
 
 =head2 get_enterable_products
@@ -370,6 +388,12 @@ B<EXPERIMENTAL>
 Returns a list of the ids of the products the user can enter bugs
 against.
 
+=item B<REST>
+
+GET /product?type=enterable
+
+the returned data format is same as below.
+
 =item B<Params> (none)
 
 =item B<Returns>
@@ -379,6 +403,14 @@ ids.
 
 =item B<Errors> (none)
 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
 =back
 
 =head2 get_accessible_products
@@ -392,6 +424,12 @@ B<UNSTABLE>
 Returns a list of the ids of the products the user can search or enter
 bugs against.
 
+=item B<REST>
+
+GET /product?type=accessible
+
+the returned data format is same as below.
+
 =item B<Params> (none)
 
 =item B<Returns>
@@ -401,6 +439,14 @@ ids.
 
 =item B<Errors> (none)
 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
 =back
 
 =head2 get
@@ -417,6 +463,12 @@ B<Note>: You must at least specify one of C<ids> or C<names>.
 
 B<Note>: Can also be called as "get_products" for compatibilty with Bugzilla 3.0 API.
 
+=item B<REST>
+
+GET /product/<product_id_or_name>
+
+the returned data format is same as below.
+
 =item B<Params>
 
 In addition to the parameters below, this method also accepts the
@@ -612,6 +664,8 @@ been removed.
 =item In Bugzilla B<4.4>, C<flag_types> was added to the fields returned
 by C<get>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -628,9 +682,16 @@ B<EXPERIMENTAL>
 
 This allows you to create a new product in Bugzilla.
 
-=item B<Params> 
+=item B<REST>
 
-Some params must be set, or an error will be thrown. These params are 
+POST /product
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+Some params must be set, or an error will be thrown. These params are
 marked B<Required>.
 
 =over
@@ -709,6 +770,14 @@ You must specify a version for this product.
 
 =back
 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
 =back
 
 =head2 update
@@ -721,6 +790,14 @@ B<EXPERIMENTAL>
 
 This allows you to update a product in Bugzilla.
 
+=item B<REST>
+
+PUT /product/<product_id_or_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params will be overridden as
+it is pulled from the URL path.
+
 =item B<Params>
 
 B<Note:> The following parameters specify which products you are updating.
@@ -859,6 +936,8 @@ You must define a default milestone.
 
 =item Added in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
diff --git a/Bugzilla/WebService/Server/REST.pm b/Bugzilla/WebService/Server/REST.pm
new file mode 100644
index 000000000..00c71110f
--- /dev/null
+++ b/Bugzilla/WebService/Server/REST.pm
@@ -0,0 +1,617 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::WebService::Server::REST;
+
+use 5.10.1;
+use strict;
+
+use parent qw(Bugzilla::WebService::Server::JSONRPC);
+
+use Bugzilla;
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::WebService::Constants;
+use Bugzilla::WebService::Util qw(taint_data);
+use Bugzilla::Util qw(correct_urlbase html_quote);
+
+# Load resource modules
+use Bugzilla::WebService::Server::REST::Resources::Bug;
+use Bugzilla::WebService::Server::REST::Resources::Bugzilla;
+use Bugzilla::WebService::Server::REST::Resources::Classification;
+use Bugzilla::WebService::Server::REST::Resources::Group;
+use Bugzilla::WebService::Server::REST::Resources::Product;
+use Bugzilla::WebService::Server::REST::Resources::User;
+
+use Scalar::Util qw(blessed reftype);
+use MIME::Base64 qw(decode_base64);
+
+###########################
+# Public Method Overrides #
+###########################
+
+sub handle {
+    my ($self)  = @_;
+
+    # Determine how the data should be represented. We do this early so
+    # errors will also be returned with the proper content type.
+    $self->content_type($self->_best_content_type(REST_CONTENT_TYPE_WHITELIST()));
+
+    # Using current path information, decide which class/method to
+    # use to serve the request. Throw error if no resource was found
+    # unless we were looking for OPTIONS
+    if (!$self->_find_resource($self->cgi->path_info)) {
+        if ($self->request->method eq 'OPTIONS'
+            && $self->bz_rest_options)
+        {
+            my $response = $self->response_header(STATUS_OK, "");
+            my $options_string = join(', ', @{ $self->bz_rest_options });
+            $response->header('Allow' => $options_string,
+                              'Access-Control-Allow-Methods' => $options_string);
+            return $self->response($response);
+        }
+
+        ThrowUserError("rest_invalid_resource",
+                       { path   => $self->cgi->path_info,
+                         method => $self->request->method });
+    }
+
+    # Dispatch to the proper module
+    my $class  = $self->bz_class_name;
+    my ($path) = $class =~ /::([^:]+)$/;
+    $self->path_info($path);
+    delete $self->{dispatch_path};
+    $self->dispatch({ $path => $class });
+
+    my $params = $self->_retrieve_json_params;
+
+    $self->_fix_credentials($params);
+
+    # Fix includes/excludes for each call
+    rest_include_exclude($params);
+
+    # Set callback name if exists
+    $self->_bz_callback($params->{'callback'}) if $params->{'callback'};
+
+    Bugzilla->input_params($params);
+
+    # Set the JSON version to 1.1 and the id to the current urlbase
+    # also set up the correct handler method
+    my $obj = {
+        version => '1.1',
+        id      => correct_urlbase(),
+        method  => $self->bz_method_name,
+        params  => $params
+    };
+
+    # Execute the handler
+    my $result = $self->_handle($obj);
+
+    if (!$self->error_response_header) {
+        return $self->response(
+            $self->response_header($self->bz_success_code || STATUS_OK, $result));
+    }
+
+    $self->response($self->error_response_header);
+}
+
+sub response {
+    my ($self, $response) = @_;
+
+    # If we have thrown an error, the 'error' key will exist
+    # otherwise we use 'result'. JSONRPC returns other data
+    # along with the result/error such as version and id which
+    # we will strip off for REST calls.
+    my $content = $response->content;
+    my $json_data = {};
+    if ($content) {
+        $json_data = $self->json->decode($content);
+    }
+
+    my $result = {};
+    if (exists $json_data->{error}) {
+        $result = $json_data->{error};
+        $result->{error} = $self->type('boolean', 1);
+        delete $result->{'name'}; # Remove JSONRPCError
+    }
+    elsif (exists $json_data->{result}) {
+        $result = $json_data->{result};
+    }
+
+    # Access Control
+    $response->header("Access-Control-Allow-Origin", "*");
+
+    # If accessing through web browser, then display in readable format
+    if ($self->content_type eq 'text/html') {
+        $result = $self->json->pretty->canonical->encode($result);
+
+        my $template = Bugzilla->template;
+        $content = "";
+        $template->process("rest.html.tmpl", { result => $result }, \$content)
+            || ThrowTemplateError($template->error());
+
+        $response->content_type('text/html');
+    }
+    else {
+        $content = $self->json->encode($result);
+    }
+
+    $response->content($content);
+
+    $self->SUPER::response($response);
+}
+
+#######################################
+# Bugzilla::WebService Implementation #
+#######################################
+
+sub handle_login {
+    my $self = shift;
+
+    # If we're being called using GET, we don't allow cookie-based or Env
+    # login, because GET requests can be done cross-domain, and we don't
+    # want private data showing up on another site unless the user
+    # explicitly gives that site their username and password. (This is
+    # particularly important for JSONP, which would allow a remote site
+    # to use private data without the user's knowledge, unless we had this
+    # protection in place.)
+    if (!grep($_ eq $self->request->method, ('POST', 'PUT'))) {
+        # XXX There's no particularly good way for us to get a parameter
+        # to Bugzilla->login at this point, so we pass this information
+        # around using request_cache, which is a bit of a hack. The
+        # implementation of it is in Bugzilla::Auth::Login::Stack.
+        Bugzilla->request_cache->{'auth_no_automatic_login'} = 1;
+    }
+
+    my $class = $self->bz_class_name;
+    my $method = $self->bz_method_name;
+    my $full_method = $class . "." . $method;
+
+    # Bypass JSONRPC::handle_login
+    Bugzilla::WebService::Server->handle_login($class, $method, $full_method);
+}
+
+############################
+# Private Method Overrides #
+############################
+
+# We do not want to run Bugzilla::WebService::Server::JSONRPC->_find_prodedure
+# as it determines the method name differently.
+sub _find_procedure {
+    my $self = shift;
+    if ($self->isa('JSON::RPC::Server::CGI')) {
+        return JSON::RPC::Server::_find_procedure($self, @_);
+    }
+    else {
+        return JSON::RPC::Legacy::Server::_find_procedure($self, @_);
+    }
+}
+
+sub _argument_type_check {
+    my $self = shift;
+    my $params;
+
+    if ($self->isa('JSON::RPC::Server::CGI')) {
+        $params = JSON::RPC::Server::_argument_type_check($self, @_);
+    }
+    else {
+        $params = JSON::RPC::Legacy::Server::_argument_type_check($self, @_);
+    }
+
+    # JSON-RPC 1.0 requires all parameters to be passed as an array, so
+    # we just pull out the first item and assume it's an object.
+    my $params_is_array;
+    if (ref $params eq 'ARRAY') {
+        $params = $params->[0];
+        $params_is_array = 1;
+    }
+
+    taint_data($params);
+
+    Bugzilla->input_params($params);
+
+    # Now, convert dateTime fields on input.
+    my $method = $self->bz_method_name;
+    my $pkg = $self->{dispatch_path}->{$self->path_info};
+    my @date_fields = @{ $pkg->DATE_FIELDS->{$method} || [] };
+    foreach my $field (@date_fields) {
+        if (defined $params->{$field}) {
+            my $value = $params->{$field};
+            if (ref $value eq 'ARRAY') {
+                $params->{$field} =
+                    [ map { $self->datetime_format_inbound($_) } @$value ];
+            }
+            else {
+                $params->{$field} = $self->datetime_format_inbound($value);
+            }
+        }
+    }
+    my @base64_fields = @{ $pkg->BASE64_FIELDS->{$method} || [] };
+    foreach my $field (@base64_fields) {
+        if (defined $params->{$field}) {
+            $params->{$field} = decode_base64($params->{$field});
+        }
+    }
+
+    # This is the best time to do login checks.
+    $self->handle_login();
+
+    # Bugzilla::WebService packages call internal methods like
+    # $self->_some_private_method. So we have to inherit from
+    # that class as well as this Server class.
+    my $new_class = ref($self) . '::' . $pkg;
+    my $isa_string = 'our @ISA = qw(' . ref($self) . " $pkg)";
+    eval "package $new_class;$isa_string;";
+    bless $self, $new_class;
+
+    if ($params_is_array) {
+        $params = [$params];
+    }
+
+    return $params;
+}
+
+###################
+# Utility Methods #
+###################
+
+sub bz_method_name {
+    my ($self, $method) = @_;
+    $self->{_bz_method_name} = $method if $method;
+    return $self->{_bz_method_name};
+}
+
+sub bz_class_name {
+    my ($self, $class) = @_;
+    $self->{_bz_class_name} = $class if $class;
+    return $self->{_bz_class_name};
+}
+
+sub bz_success_code {
+    my ($self, $value) = @_;
+    $self->{_bz_success_code} = $value if $value;
+    return $self->{_bz_success_code};
+}
+
+sub bz_rest_params {
+    my ($self, $params) = @_;
+    $self->{_bz_rest_params} = $params if $params;
+    return $self->{_bz_rest_params};
+}
+
+sub bz_rest_options {
+    my ($self, $options) = @_;
+    $self->{_bz_rest_options} = $options if $options;
+    return $self->{_bz_rest_options};
+}
+
+sub rest_include_exclude {
+    my ($params) = @_;
+
+    # _all is same as default columns
+    if ($params->{'include_fields'}
+        && ($params->{'include_fields'} eq '_all'
+            || $params->{'include_fields'} eq '_default'))
+    {
+        delete $params->{'include_fields'};
+        delete $params->{'exclude_fields'} if $params->{'exclude_fields'};
+    }
+
+    if ($params->{'include_fields'} && !ref $params->{'include_fields'}) {
+        $params->{'include_fields'} = [ split(/[\s+,]/, $params->{'include_fields'}) ];
+    }
+    if ($params->{'exclude_fields'} && !ref $params->{'exclude_fields'}) {
+        $params->{'exclude_fields'} = [ split(/[\s+,]/, $params->{'exclude_fields'}) ];
+    }
+
+    return $params;
+}
+
+##########################
+# Private Custom Methods #
+##########################
+
+sub _retrieve_json_params {
+    my $self = shift;
+
+    # Make a copy of the current input_params rather than edit directly
+    my $params = {};
+    %{$params} = %{ Bugzilla->input_params };
+
+    # First add any params we were able to pull out of the path
+    # based on the resource regexp
+    %{$params} = (%{$params}, %{$self->bz_rest_params}) if $self->bz_rest_params;
+
+    # Merge any additional query key/values with $obj->{params} if not a GET request
+    # We do this manually cause CGI.pm doesn't understand JSON strings.
+    if ($self->request->method ne 'GET') {
+        my $extra_params = {};
+        my $json = delete $params->{'POSTDATA'} || delete $params->{'PUTDATA'};
+        if ($json) {
+            eval { $extra_params = $self->json->decode($json); };
+            if ($@) {
+                ThrowUserError('json_rpc_invalid_params', { err_msg  => $@ });
+            }
+        }
+        %{$params} = (%{$params}, %{$extra_params}) if %{$extra_params};
+    }
+
+    return $params;
+}
+
+sub _find_resource {
+    my ($self, $path) = @_;
+
+    # Load in the WebService module from the dispatch map and then call
+    # $module->rest_resources to get the resources array ref.
+    my $resources = {};
+    foreach my $module (values %{ $self->{dispatch_path} }) {
+        eval("require $module") || die $@;
+        next if !$module->can('rest_resources');
+        $resources->{$module} = $module->rest_resources;
+    }
+
+    # Use the resources hash from each module loaded earlier to determine
+    # which handler to use based on a regex match of the CGI path.
+    # Also any matches found in the regex will be passed in later to the
+    # handler for possible use.
+    my $request_method = $self->request->method;
+
+    my (@matches, $handler_found, $handler_method, $handler_class);
+    foreach my $class (keys %{ $resources }) {
+        # The resource data for each module needs to be
+        # an array ref with an even number of elements
+        # to work correctly.
+        next if (ref $resources->{$class} ne 'ARRAY'
+                 || scalar @{ $resources->{$class} } % 2 != 0);
+
+        while (my $regex = shift @{ $resources->{$class} }) {
+            my $options_data = shift @{ $resources->{$class} };
+            next if ref $options_data ne 'HASH';
+
+            if (@matches = ($path =~ $regex)) {
+                # If a specific path is accompanied by a OPTIONS request
+                # method, the user is asking for a list of possible request
+                # methods for a specific path.
+                $self->bz_rest_options([ keys %{ $options_data } ]);
+
+                if ($options_data->{$request_method}) {
+                    my $resource_data = $options_data->{$request_method};
+                    $self->bz_class_name($class);
+
+                    # The method key/value can be a simple scalar method name
+                    # or a anonymous subroutine so we execute it here.
+                    my $method = ref $resource_data->{method} eq 'CODE'
+                                 ? $resource_data->{method}->($self)
+                                 : $resource_data->{method};
+                    $self->bz_method_name($method);
+
+                    # Pull out any parameters parsed from the URL path
+                    # and store them for use by the method.
+                    if ($resource_data->{params}) {
+                        $self->bz_rest_params($resource_data->{params}->(@matches));
+                    }
+
+                    # If a special success code is needed for this particular
+                    # method, then store it for later when generating response.
+                    if ($resource_data->{success_code}) {
+                        $self->bz_success_code($resource_data->{success_code});
+                    }
+                    $handler_found = 1;
+                }
+            }
+            last if $handler_found;
+        }
+        last if $handler_found;
+    }
+
+    return $handler_found;
+}
+
+sub _fix_credentials {
+    my ($self, $params) = @_;
+    # Allow user to pass in &username=foo&password=bar
+    if (exists $params->{'username'} && exists $params->{'password'}) {
+        $params->{'Bugzilla_login'}    = delete $params->{'username'};
+        $params->{'Bugzilla_password'} = delete $params->{'password'};
+    }
+}
+
+sub _best_content_type {
+    my ($self, @types) = @_;
+    return ($self->_simple_content_negotiation(@types))[0] || '*/*';
+}
+
+sub _simple_content_negotiation {
+    my ($self, @types) = @_;
+    my @accept_types = $self->_get_content_prefs();
+    my $score = sub { $self->_score_type(shift, @accept_types) };
+    return sort {$score->($b) <=> $score->($a)} @types;
+}
+
+sub _score_type {
+    my ($self, $type, @accept_types) = @_;
+    my $score = scalar(@accept_types);
+    for my $accept_type (@accept_types) {
+        return $score if $type eq $accept_type;
+        $score--;
+    }
+    return 0;
+}
+
+sub _get_content_prefs {
+    my $self = shift;
+    my $default_weight = 1;
+    my @prefs;
+
+    # Parse the Accept header, and save type name, score, and position.
+    my @accept_types = split /,/, $self->cgi->http('accept') || '';
+    my $order = 0;
+    for my $accept_type (@accept_types) {
+        my ($weight) = ($accept_type =~ /q=(\d\.\d+|\d+)/);
+        my ($name) = ($accept_type =~ m#(\S+/[^;]+)#);
+        next unless $name;
+        push @prefs, { name => $name, order => $order++};
+        if (defined $weight) {
+            $prefs[-1]->{score} = $weight;
+        } else {
+            $prefs[-1]->{score} = $default_weight;
+            $default_weight -= 0.001;
+        }
+    }
+
+    # Sort the types by score, subscore by order, and pull out just the name
+    @prefs = map {$_->{name}} sort {$b->{score} <=> $a->{score} ||
+                                    $a->{order} <=> $b->{order}} @prefs;
+    return @prefs, '*/*';  # Allows allow for */*
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::WebService::Server::REST - The REST Interface to Bugzilla
+
+=head1 DESCRIPTION
+
+This documentation describes things about the Bugzilla WebService that
+are specific to REST. For a general overview of the Bugzilla WebServices,
+see L<Bugzilla::WebService>. The L<Bugzilla::WebService::Server::REST>
+module is a sub-class of L<Bugzilla::WebService::Server::JSONRPC> so any
+method documentation not found here can be viewed in it's POD.
+
+Please note that I<everything> about this REST interface is
+B<EXPERIMENTAL>. If you want a fully stable API, please use the
+C<Bugzilla::WebService::Server::XMLRPC|XML-RPC> interface.
+
+=head1 CONNECTING
+
+The endpoint for the REST interface is the C<rest.cgi> script in
+your Bugzilla installation. If using Apache and mod_rewrite is installed
+and enabled, you can also use /rest/ as your endpoint. For example, if your
+Bugzilla is at C<bugzilla.yourdomain.com>, then your REST client would
+access the API via: C<http://bugzilla.yourdomain.com/rest/bug/35> which
+looks cleaner.
+
+=head1 BROWSING
+
+If the Accept: header of a request is set to text/html (as it is by an
+ordinary web browser) then the API will return the JSON data as a HTML
+page which the browser can display. In other words, you can play with the
+API using just your browser and see results in a human-readable form.
+This is a good way to try out the various GET calls, even if you can't use
+it for POST or PUT.
+
+=head1 DATA FORMAT
+
+The REST API only supports JSON input, and either JSON and JSONP output.
+So objects sent and received must be in JSON format. Basically since
+the REST API is a sub class of the JSONRPC API, you can refer to
+L<JSONRPC|Bugzilla::WebService::Server::JSONRPC> for more information
+on data types that are valid for REST.
+
+On every request, you must set both the "Accept" and "Content-Type" HTTP
+headers to the MIME type of the data format you are using to communicate with
+the API. Content-Type tells the API how to interpret your request, and Accept
+tells it how you want your data back. "Content-Type" must be "application/json".
+"Accept" can be either that, or "application/javascript" for JSONP - add a "callback"
+parameter to name your callback.
+
+=head1 AUTHENTICATION
+
+Along with viewing data as an anonymous user, you may also see private information
+if you have a Bugzilla account by providing your login credentials.
+
+=over
+
+=item Username and password
+
+Pass in as query parameters of any request:
+
+username=fred@bedrock.com&password=ilovewilma
+
+Remember to URL encode any special characters, which are often seen in passwords and to
+also enable SSL support.
+
+=back
+
+=head1 ERRORS
+
+When an error occurs over REST, a hash structure is returned with the key C<error>
+set to C<true>.
+
+The error contents look similar to:
+
+ { "error": true, "message": "Some message here", "code": 123 }
+
+Every error has a "code", as described in L<Bugzilla::WebService/ERRORS>.
+Errors with a numeric C<code> higher than 100000 are errors thrown by
+the JSON-RPC library that Bugzilla uses, not by Bugzilla.
+
+=head1 UTILITY FUNCTIONS
+
+=over
+
+=item B<handle>
+
+This method overrides the handle method provided by JSONRPC so that certain
+actions related to REST such as determining the proper resource to use,
+loading query parameters, etc. can be done before the proper WebService
+method is executed.
+
+=item B<response>
+
+This method overrides the response method provided by JSONRPC so that
+the response content can be altered for REST before being returned to
+the client.
+
+=item B<handle_login>
+
+This method determines the proper WebService all to make based on class
+and method name determined earlier. Then calls L<Bugzilla::WebService::Server::handle_login>
+which will attempt to authenticate the client.
+
+=item B<bz_method_name>
+
+The WebService method name that matches the path used by the client.
+
+=item B<bz_class_name>
+
+The WebService class containing the method that matches the path used by the client.
+
+=item B<bz_rest_params>
+
+Each REST resource contains a hash key called C<params> that is a subroutine reference.
+This subroutine will return a hash structure based on matched values from the path
+information that is formatted properly for the WebService method that will be called.
+
+=item B<bz_rest_options>
+
+When a client uses the OPTIONS request method along with a specific path, they are
+requesting the list of request methods that are valid for the path. Such as for the
+path /bug, the valid request methods are GET (search) and POST (create). So the
+client would receive in the response header, C<Access-Control-Allow-Methods: GET, POST>.
+
+=item B<bz_success_code>
+
+Each resource can specify a specific SUCCESS CODE if the operation completes successfully.
+OTherwise STATUS OK (200) is the default returned.
+
+=item B<rest_include_exclude>
+
+Normally the WebService methods required C<include_fields> and C<exclude_fields> to be an
+array of field names. REST allows for the values for these to be instead comma delimited
+string of field names. This method converts the latter into the former so the WebService
+methods will not complain.
+
+=back
+
+=head1 SEE ALSO
+
+L<Bugzilla::WebService>
diff --git a/Bugzilla/WebService/Server/REST/Resources/Bug.pm b/Bugzilla/WebService/Server/REST/Resources/Bug.pm
new file mode 100644
index 000000000..a82625be7
--- /dev/null
+++ b/Bugzilla/WebService/Server/REST/Resources/Bug.pm
@@ -0,0 +1,152 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::WebService::Server::REST::Resources::Bug;
+
+use 5.10.1;
+use strict;
+
+use Bugzilla::WebService::Constants;
+use Bugzilla::WebService::Bug;
+
+BEGIN {
+    *Bugzilla::WebService::Bug::rest_resources = \&_rest_resources;
+};
+
+sub _rest_resources {
+    my $rest_resources = [
+        qr{^/bug$}, {
+            GET  => {
+                method => 'search',
+            },
+            POST => {
+                method => 'create',
+                status_code => STATUS_CREATED
+            }
+        },
+        qr{^/bug/([^/]+)$}, {
+            GET => {
+                method => 'get',
+                params => sub {
+                    return { ids => [ $_[0] ] };
+                }
+            },
+            PUT => {
+                method => 'update',
+                params => sub {
+                    return { ids => [ $_[0] ] };
+                }
+            }
+        },
+        qr{^/bug/([^/]+)/comment$}, {
+            GET  => {
+                method => 'comments',
+                params => sub {
+                    return { ids => [ $_[0] ] };
+                }
+            },
+            POST => {
+                method => 'add_comment',
+                params => sub {
+                    return { id => $_[0] };
+                },
+                success_code => STATUS_CREATED
+            }
+        },
+        qr{^/bug/comment/([^/]+)$}, {
+            GET => {
+                method => 'comments',
+                params => sub {
+                    return { comment_ids => [ $_[0] ] };
+                }
+            }
+        },
+        qr{^/bug/([^/]+)/history$}, {
+            GET => {
+                method => 'history',
+                params => sub {
+                    return { ids => [ $_[0] ] };
+                },
+            }
+        },
+        qr{^/bug/([^/]+)/attachment$}, {
+            GET  => {
+                method => 'attachments',
+                params => sub {
+                    return { ids => [ $_[0] ] };
+                }
+            },
+            POST => {
+                method => 'add_attachment',
+                params => sub {
+                    return { ids => [ $_[0] ] };
+                },
+                success_code => STATUS_CREATED
+            }
+        },
+        qr{^/bug/attachment/([^/]+)$}, {
+            GET => {
+                method => 'attachments',
+                params => sub {
+                    return { attachment_ids => [ $_[0] ] };
+                }
+            }
+        },
+        qr{^/field/bug$}, {
+            GET => {
+                method => 'fields',
+            }
+        },
+        qr{^/field/bug/([^/]+)$}, {
+            GET => {
+                method => 'fields',
+                params => sub {
+                    my $value = $_[0];
+                    my $param = 'names';
+                    $param = 'ids' if $value =~ /^\d+$/;
+                    return { $param => [ $_[0] ] };
+                }
+            }
+        },
+        qr{^/field/bug/([^/]+)/values$}, {
+            GET => {
+                method => 'legal_values',
+                params => sub {
+                    return { field => $_[0] };
+                }
+            }
+        },
+        qr{^/field/bug/([^/]+)/([^/]+)/values$}, {
+            GET => {
+                method => 'legal_values',
+                params => sub {
+                    return { field      => $_[0],
+                             product_id => $_[1] };
+                }
+            }
+        },
+
+    ];
+    return $rest_resources;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::Webservice::Server::REST::Resources::Bug - The REST API for creating,
+changing, and getting the details of bugs.
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla REST API allows you to file a new bug in Bugzilla,
+or get information about bugs that have already been filed.
+
+See L<Bugzilla::WebService::Bug> for more details on how to use this part of
+the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm b/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm
new file mode 100644
index 000000000..1c86f77bc
--- /dev/null
+++ b/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm
@@ -0,0 +1,69 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::WebService::Server::REST::Resources::Bugzilla;
+
+use 5.10.1;
+use strict;
+
+use Bugzilla::WebService::Constants;
+use Bugzilla::WebService::Bugzilla;
+
+BEGIN {
+    *Bugzilla::WebService::Bugzilla::rest_resources = \&_rest_resources;
+};
+
+sub _rest_resources {
+    my $rest_resources = [
+        qr{^/version$}, {
+            GET  => {
+                method => 'version'
+            }
+        },
+        qr{^/extensions$}, {
+            GET => {
+                method => 'extensions'
+            }
+        },
+        qr{^/timezone$}, {
+            GET => {
+                method => 'timezone'
+            }
+        },
+        qr{^/time$}, {
+            GET => {
+                method => 'time'
+            }
+        },
+        qr{^/last_audit_time$}, {
+            GET => {
+                method => 'last_audit_time'
+            }
+        },
+        qr{^/parameters$}, {
+            GET => {
+                method => 'parameters'
+            }
+        }
+    ];
+    return $rest_resources;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::WebService::Bugzilla - Global functions for the webservice interface.
+
+=head1 DESCRIPTION
+
+This provides functions that tell you about Bugzilla in general.
+
+See L<Bugzilla::WebService::Bugzilla> for more details on how to use this part
+of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Classification.pm b/Bugzilla/WebService/Server/REST/Resources/Classification.pm
new file mode 100644
index 000000000..5bb697ac1
--- /dev/null
+++ b/Bugzilla/WebService/Server/REST/Resources/Classification.pm
@@ -0,0 +1,49 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::WebService::Server::REST::Resources::Classification;
+
+use 5.10.1;
+use strict;
+
+use Bugzilla::WebService::Constants;
+use Bugzilla::WebService::Classification;
+
+BEGIN {
+    *Bugzilla::WebService::Classification::rest_resources = \&_rest_resources;
+};
+
+sub _rest_resources {
+    my $rest_resources = [
+        qr{^/classification/([^/]+)$}, {
+            GET => {
+                method => 'get',
+                params => sub {
+                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+                    return { $param => [ $_[0] ] };
+                }
+            }
+        }
+    ];
+    return $rest_resources;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::Webservice::Server::REST::Resources::Classification - The Classification REST API
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla REST API allows you to deal with the available Classifications.
+You will be able to get information about them as well as manipulate them.
+
+See L<Bugzilla::WebService::Bug> for more details on how to use this part
+of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Group.pm b/Bugzilla/WebService/Server/REST/Resources/Group.pm
new file mode 100644
index 000000000..9200d609d
--- /dev/null
+++ b/Bugzilla/WebService/Server/REST/Resources/Group.pm
@@ -0,0 +1,56 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::WebService::Server::REST::Resources::Group;
+
+use 5.10.1;
+use strict;
+
+use Bugzilla::WebService::Constants;
+use Bugzilla::WebService::Group;
+
+BEGIN {
+    *Bugzilla::WebService::Group::rest_resources = \&_rest_resources;
+};
+
+sub _rest_resources {
+    my $rest_resources = [
+        qr{^/group$}, {
+            POST => {
+                method => 'create',
+                success_code => STATUS_CREATED
+            }
+        },
+        qr{^/group/([^/]+)$}, {
+            PUT => {
+                method => 'update',
+                params => sub {
+                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+                    return { $param => [ $_[0] ] };
+                }
+            }
+        }
+    ];
+    return $rest_resources;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::Webservice::Server::REST::Resources::Group - The REST API for 
+creating, changing, and getting information about Groups.
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla REST API allows you to create Groups and
+get information about them.
+
+See L<Bugzilla::WebService::Group> for more details on how to use this part
+of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Product.pm b/Bugzilla/WebService/Server/REST/Resources/Product.pm
new file mode 100644
index 000000000..1949282e9
--- /dev/null
+++ b/Bugzilla/WebService/Server/REST/Resources/Product.pm
@@ -0,0 +1,75 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::WebService::Server::REST::Resources::Product;
+
+use 5.10.1;
+use strict;
+
+use Bugzilla::WebService::Constants;
+use Bugzilla::WebService::Product;
+
+use Bugzilla::Error;
+
+BEGIN {
+    *Bugzilla::WebService::Product::rest_resources = \&_rest_resources;
+};
+
+sub _rest_resources {
+    my $rest_resources = [
+        qr{^/product$}, {
+            GET  => {
+                method => sub {
+                    my $type = Bugzilla->input_params->{type};
+                    return 'get_accessible_products'
+                        if !defined $type || $type eq 'accessible';
+                    return 'get_enterable_products' if $type eq 'enterable';
+                    return 'get_selectable_products' if $type eq 'selectable';
+                    ThrowUserError('rest_get_products_invalid_type',
+                                   { type => $type });
+                },
+            },
+            POST => {
+                method => 'create',
+                success_code => STATUS_CREATED
+            }
+        },
+        qr{^/product/([^/]+)$}, {
+            GET => {
+                method => 'get',
+                params => sub {
+                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+                    return { $param => [ $_[0] ] };
+                }
+            },
+            PUT => {
+                method => 'update',
+                params => sub {
+                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+                    return { $param => [ $_[0] ] };
+                }
+            }
+        },
+    ];
+    return $rest_resources;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::Webservice::Server::REST::Resources::Product - The Product REST API
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla REST API allows you to list the available Products and
+get information about them.
+
+See L<Bugzilla::WebService::Bug> for more details on how to use this part of
+the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/User.pm b/Bugzilla/WebService/Server/REST/Resources/User.pm
new file mode 100644
index 000000000..9424b517e
--- /dev/null
+++ b/Bugzilla/WebService/Server/REST/Resources/User.pm
@@ -0,0 +1,65 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::WebService::Server::REST::Resources::User;
+
+use 5.10.1;
+use strict;
+
+use Bugzilla::WebService::Constants;
+use Bugzilla::WebService::User;
+
+BEGIN {
+    *Bugzilla::WebService::User::rest_resources = \&_rest_resources;
+};
+
+sub _rest_resources {
+    my $rest_resources = [
+        qr{^/user$}, {
+            GET  => {
+                method => 'get'
+            },
+            POST => {
+                method => 'create',
+                success_code => STATUS_CREATED
+            }
+        },
+        qr{^/user/([^/]+)$}, {
+            GET => {
+                method => 'get',
+                params => sub {
+                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+                    return { $param => [ $_[0] ] };
+                }
+            },
+            PUT => {
+                method => 'update',
+                params => sub {
+                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+                    return { $param => [ $_[0] ] };
+                }
+            }
+        }
+    ];
+    return $rest_resources;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::Webservice::Server::REST::Resources::User - The User Account REST API
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla REST API allows you to get User information as well
+as create User Accounts.
+
+See L<Bugzilla::WebService::Bug> for more details on how to use this part of
+the REST API.
diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index b8a3763a2..08c812076 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -127,7 +127,7 @@ sub create {
 # $call = $rpc->call( 'User.get', { ids => [1,2,3], 
 #         names => ['testusera@redhat.com', 'testuserb@redhat.com'] });
 sub get {
-    my ($self, $params) = validate(@_, 'names', 'ids');
+    my ($self, $params) = validate(@_, 'names', 'ids', 'match', 'group_ids', 'groups');
 
     Bugzilla->switch_to_shadow_db();
 
@@ -399,6 +399,10 @@ log in/out using an existing account.
 See L<Bugzilla::WebService> for a description of how parameters are passed,
 and what B<STABLE>, B<UNSTABLE>, and B<EXPERIMENTAL> mean.
 
+Although the data input and output is the same for JSONRPC, XMLRPC and REST,
+the directions for how to access the data via REST is noted in each method
+where applicable.
+
 =head1 Logging In and Out
 
 =head2 login
@@ -417,7 +421,7 @@ etc. This method logs in an user.
 
 =over
 
-=item C<login> (string) - The user's login name. 
+=item C<login> (string) - The user's login name.
 
 =item C<password> (string) - The user's password.
 
@@ -541,6 +545,13 @@ actually receive an email. This function does not check that.
 You must be logged in and have the C<editusers> privilege in order to
 call this function.
 
+=item B<REST>
+
+POST /user
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
 =item B<Params>
 
 =over
@@ -584,6 +595,8 @@ password is under three characters.)
 
 =item Error 503 (Password Too Long) removed in Bugzilla B<3.6>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
@@ -598,6 +611,14 @@ B<EXPERIMENTAL>
 
 Updates user accounts in Bugzilla.
 
+=item B<REST>
+
+PUT /user/<user_id_or_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params are overridden as they
+are pulled from the URL path.
+
 =item B<Params>
 
 =over
@@ -684,6 +705,14 @@ Logged-in users are not authorized to edit other users.
 
 =back
 
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
 =back
 
 =head1 User Info
@@ -698,6 +727,18 @@ B<STABLE>
 
 Gets information about user accounts in Bugzilla.
 
+=item B<REST>
+
+To get information about a single user:
+
+GET /user/<user_id_or_name>
+
+To search for users by name, group using URL params same as below:
+
+GET /user
+
+The returned data format is the same as below.
+
 =item B<Params>
 
 B<Note>: At least one of C<ids>, C<names>, or C<match> must be specified.
@@ -920,6 +961,8 @@ illegal to pass a group name you don't belong to.
 =item C<groups>, C<saved_searches>, and C<saved_reports> were added
 in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back
diff --git a/rest.cgi b/rest.cgi
new file mode 100755
index 000000000..928eb9ce4
--- /dev/null
+++ b/rest.cgi
@@ -0,0 +1,29 @@
+#!/usr/bin/perl -wT
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.10.1;
+use strict;
+use lib qw(. lib);
+
+use Bugzilla;
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::WebService::Constants;
+BEGIN {
+    if (!Bugzilla->feature('rest')
+        || !Bugzilla->feature('jsonrpc'))
+    {
+        ThrowUserError('feature_disabled', { feature => 'rest' });
+    }
+}
+use Bugzilla::WebService::Server::REST;
+Bugzilla->usage_mode(USAGE_MODE_REST);
+local @INC = (bz_locations()->{extensionsdir}, @INC);
+my $server = new Bugzilla::WebService::Server::REST;
+$server->version('1.1');
+$server->handle();
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 58d347376..6bb0a2bae 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1073,6 +1073,13 @@
     For security reasons, you must use HTTP POST to call the
     '[% method FILTER html %]' method.
 
+  [% ELSIF error == "rest_invalid_resource" %]
+    A REST API resource was not found for '[% method FILTER html +%] [%+ path FILTER html %]'.
+
+  [% ELSIF error == "rest_get_products_invalid_type" %]
+    The type '[% type FILTER html %]' is invalid for 'GET /product'. Valid choices
+    are 'accessible' (default if type value is undefined), 'selectable', and 'enterable'.
+
   [% ELSIF error == "keyword_already_exists" %]
     [% title = "Keyword Already Exists" %]
     A keyword with the name [% name FILTER html %] already exists.
diff --git a/template/en/default/rest.html.tmpl b/template/en/default/rest.html.tmpl
new file mode 100644
index 000000000..0b8321dd1
--- /dev/null
+++ b/template/en/default/rest.html.tmpl
@@ -0,0 +1,19 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+                      "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <title>Bugzilla::REST::API</title>
+    <link href="[% urlbase FILTER none %][% 'skins/standard/global.css' FILTER mtime %]"
+          rel="stylesheet" type="text/css">
+  </head>
+  <body>
+    <pre>[% result FILTER html %]</pre>
+  </body>
+</html>

From ffd695f39d19cea7d863cd29dcfc924113ec0e7d Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Sun, 14 Jul 2013 23:43:57 -0400
Subject: [PATCH 119/240] Bug 787328 - xmlrpc.cgi doesn't send any
 security-related headers r=glob,a=justdave

---
 Bugzilla/WebService/Server/XMLRPC.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm
index b4af1ab94..eab718efc 100644
--- a/Bugzilla/WebService/Server/XMLRPC.pm
+++ b/Bugzilla/WebService/Server/XMLRPC.pm
@@ -57,8 +57,16 @@ sub make_response {
 
     # XMLRPC::Transport::HTTP::CGI doesn't know about Bugzilla carrying around
     # its cookies in Bugzilla::CGI, so we need to copy them over.
-    foreach (@{Bugzilla->cgi->{'Bugzilla_cookie_list'}}) {
-        $self->response->headers->push_header('Set-Cookie', $_);
+    foreach my $cookie (@{Bugzilla->cgi->{'Bugzilla_cookie_list'}}) {
+        $self->response->headers->push_header('Set-Cookie', $cookie);
+    }
+
+    # Copy across security related headers from Bugzilla::CGI
+    foreach my $header (split(/[\r\n]+/, Bugzilla->cgi->header)) {
+        my ($name, $value) = $header =~ /^([^:]+): (.*)/;
+        if (!$self->response->headers->header($name)) {
+           $self->response->headers->header($name => $value);
+        }
     }
 }
 

From 57ac5a20a650788ac8caa419c2f911e9ac2c81e5 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 15 Jul 2013 16:06:27 -0400
Subject: [PATCH 120/240] Bug 893922 - checksetup.pl failes to locate the
 string 'feature_rest'

---
 template/en/default/setup/strings.txt.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index f7a7e39f5..63eb3a3fd 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -94,6 +94,7 @@ END
     feature_mod_perl          => 'mod_perl',
     feature_moving            => 'Move Bugs Between Installations',
     feature_patch_viewer      => 'Patch Viewer',
+    feature_rest              => 'REST Interface',
     feature_smtp_auth         => 'SMTP Authentication',
     feature_smtp_ssl          => 'SSL Support for SMTP',
     feature_updates           => 'Automatic Update Notifications',

From 8472a7d2db191715c8fc397d3d9053c9943ccd80 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Tue, 16 Jul 2013 15:53:55 +1000
Subject: [PATCH 121/240] Bug 894221 - API Documentation Error

---
 Bugzilla/WebService/Product.pm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm
index 83a6583fa..6e9f83a2a 100644
--- a/Bugzilla/WebService/Product.pm
+++ b/Bugzilla/WebService/Product.pm
@@ -918,10 +918,6 @@ You specified the name of a product that already exists.
 
 You must specify a description for this product.
 
-=item 704 (Product must have version)
-
-You must specify a version for this product.
-
 =item 705 (Product must define a default milestone)
 
 You must define a default milestone.

From 946703dfb4dbc99cf2c22fc666acaa6f5c787dd5 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 19 Jul 2013 14:30:39 +0800
Subject: [PATCH 122/240] remove accidental commit from bug 866927

---
 .htaccess | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.htaccess b/.htaccess
index 4ec921b2c..f8611f81d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -29,6 +29,5 @@ Options -Indexes
 
 <IfModule mod_rewrite.c>
   RewriteEngine On
-RewriteBase /866927/
   RewriteRule ^rest/(.*)$ rest.cgi/$1 [NE]
 </IfModule>

From b4660c6c958338c245e0f6d1c6267dff967b166e Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 22 Jul 2013 13:14:38 +0800
Subject: [PATCH 123/240] Bug 895306: REST endpoint returns both JSON and HTML
 errors when running under mod_perl r=dkl, a=glob

---
 mod_perl.pl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mod_perl.pl b/mod_perl.pl
index 20b9746f3..1f4593f00 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -115,6 +115,7 @@ use strict;
 
 use parent qw(ModPerl::Registry);
 use Bugzilla;
+use Bugzilla::Constants qw(USAGE_MODE_REST);
 
 sub handler : method {
     my $class = shift;
@@ -132,7 +133,13 @@ sub handler : method {
     use warnings;
 
     Bugzilla::init_page();
-    return $class->SUPER::handler(@_);
+    my $result = $class->SUPER::handler(@_);
+
+    # When returning data from the REST api, tell Apache not to append its
+    # error html documents to the response.
+    return Bugzilla->usage_mode == USAGE_MODE_REST
+           ? Apache2::Const::OK
+           : $result;
 }
 
 

From dea2d09234f74b9d4466809890b14ecf37e37681 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 22 Jul 2013 13:19:19 +0800
Subject: [PATCH 124/240] Bug 850986: don't allow setting a flag's requestee to
 a disabled account r=dkl, a=justdave

---
 Bugzilla/Flag.pm                                | 7 ++++++-
 template/en/default/global/user-error.html.tmpl | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 98029a1b1..e1e75f832 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -668,9 +668,14 @@ sub _check_requestee {
         # is specifically requestable. For existing flags, if the requestee
         # was set before the flag became specifically unrequestable, the
         # user can either remove him or leave him alone.
-        ThrowUserError('flag_requestee_disabled', { type => $self->type })
+        ThrowUserError('flag_type_requestee_disabled', { type => $self->type })
           if !$self->type->is_requesteeble;
 
+        # You can't ask a disabled account, as they don't have the ability to
+        # set the flag.
+        ThrowUserError('flag_requestee_disabled', { requestee => $requestee })
+          if !$requestee->is_enabled;
+
         # Make sure the requestee can see the bug.
         # Note that can_see_bug() will query the DB, so if the bug
         # is being added/removed from some groups and these changes
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 6bb0a2bae..a4c900a22 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -633,10 +633,15 @@
     <br>Alternately, if your attachment is an image, you could convert
     it to a compressible format like JPG or PNG and try again.
 
-  [% ELSIF error == "flag_requestee_disabled" %]
+  [% ELSIF error == "flag_type_requestee_disabled" %]
     [% title = "Flag not Requestable from Specific Person" %]
     You can't ask a specific person for <em>[% type.name FILTER html %]</em>.
 
+  [% ELSIF error == "flag_requestee_disabled" %]
+    [% title = "Flag Requestee Disabled" %]
+    You can't ask <em>[% requestee.identity FILTER html %]</em> because that
+    account is disabled.
+
   [% ELSIF error == "flag_requestee_needs_privs" %]
     [% title = "Flag Requestee Needs Privileges" %]
     [% requestee.identity FILTER html %] does not have permission to set the

From 19028f34f3a0c51c950ebf08f6917afac34eee77 Mon Sep 17 00:00:00 2001
From: Hugo Seabrook <hugo.seabrook@yahoo.com>
Date: Tue, 23 Jul 2013 09:55:05 +1000
Subject: [PATCH 125/240] Bug 880227 - Install of Bugzilla DBI module fails due
 to mirror.hiwaay.net not being available

---
 Bugzilla/Install/CPAN.pm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Bugzilla/Install/CPAN.pm b/Bugzilla/Install/CPAN.pm
index d79b292f5..ba301863d 100644
--- a/Bugzilla/Install/CPAN.pm
+++ b/Bugzilla/Install/CPAN.pm
@@ -27,7 +27,6 @@ use Config;
 use CPAN;
 use Cwd qw(abs_path);
 use File::Path qw(rmtree);
-use List::Util qw(shuffle);
 
 # These are required for install-module.pl to be able to install
 # all modules properly.
@@ -89,12 +88,7 @@ use constant CPAN_DEFAULTS => {
     unzip => bin_loc('unzip'),
     wget => bin_loc('wget'),
 
-    urllist => [shuffle qw(
-        http://cpan.pair.com/
-        http://mirror.hiwaay.net/CPAN/
-        ftp://ftp.dc.aleron.net/pub/CPAN/
-        http://mirrors.kernel.org/cpan/
-        http://mirrors2.kernel.org/cpan/)],
+    urllist => ['http://www.cpan.org/'],
 };
 
 sub check_cpan_requirements {

From 0a559f519f7bb66f4073aa5d006bd6b589cba861 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 23 Jul 2013 11:09:48 +0200
Subject: [PATCH 126/240] Bug 893953: Duplicated CSS rule for "bug_id_container
 input" in search_form.css r=LpSolit a=sgreen

---
 skins/standard/search_form.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/skins/standard/search_form.css b/skins/standard/search_form.css
index e3a2ba1c4..ff97dbcbc 100644
--- a/skins/standard/search_form.css
+++ b/skins/standard/search_form.css
@@ -34,10 +34,6 @@
   width: 8em;
 }
 
-#bug_id_container input {
-  width: 9em;
-}
-
 #bug_id_type{
   width: inherit;
 }

From 81e4c4cb1b973afa309cb9d23a77408fa9f00854 Mon Sep 17 00:00:00 2001
From: rojanu <aliustek@gmail.com>
Date: Tue, 23 Jul 2013 11:15:29 +0200
Subject: [PATCH 127/240] Bug 871473: New code hook "before_read" in Migrate.pm
 r=LpSolit a=sgreen

---
 Bugzilla/Migrate.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm
index 6f3570fd3..db5db4712 100644
--- a/Bugzilla/Migrate.pm
+++ b/Bugzilla/Migrate.pm
@@ -153,6 +153,7 @@ sub do_migration {
     }    
     $dbh->bz_start_transaction();
 
+    $self->before_read();
     # Read Other Database
     my $users    = $self->users;
     my $products = $self->products;
@@ -544,6 +545,7 @@ sub write_config {
 sub after_insert  {}
 sub before_insert {}
 sub after_read    {}
+sub before_read   {}
 
 #############
 # Inserters #
@@ -1147,6 +1149,11 @@ and yet shouldn't be added to the initial description of the bug when
 translating bugs, then they should be listed here. See L</translate_bug> for
 more detail.
 
+=head2 before_read
+
+This is called before any data is read from the "other bug-tracker".
+The default implementation does nothing.
+
 =head2 after_read
 
 This is run after all data is read from the other bug-tracker, but

From 1046c09447493f865184e6e92421732c53848e45 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 23 Jul 2013 16:24:59 -0400
Subject: [PATCH 128/240] Bug 896066 - Allow REST WebService API to for GET
 /product to allow retrieval of multiple product objects r/a=glob

---
 Bugzilla/WebService/Product.pm                | 127 ++++++++++++------
 .../Server/REST/Resources/Product.pm          |  25 ++--
 .../en/default/global/user-error.html.tmpl    |   6 +-
 3 files changed, 106 insertions(+), 52 deletions(-)

diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm
index 6e9f83a2a..c028c5845 100644
--- a/Bugzilla/WebService/Product.pm
+++ b/Bugzilla/WebService/Product.pm
@@ -50,64 +50,93 @@ BEGIN { *get_products = \&get }
 # Get the ids of the products the user can search
 sub get_selectable_products {
     Bugzilla->switch_to_shadow_db();
-    return {ids => [map {$_->id} @{Bugzilla->user->get_selectable_products}]}; 
+    return {ids => [map {$_->id} @{Bugzilla->user->get_selectable_products}]};
 }
 
 # Get the ids of the products the user can enter bugs against
 sub get_enterable_products {
     Bugzilla->switch_to_shadow_db();
-    return {ids => [map {$_->id} @{Bugzilla->user->get_enterable_products}]}; 
+    return {ids => [map {$_->id} @{Bugzilla->user->get_enterable_products}]};
 }
 
 # Get the union of the products the user can search and enter bugs against.
 sub get_accessible_products {
     Bugzilla->switch_to_shadow_db();
-    return {ids => [map {$_->id} @{Bugzilla->user->get_accessible_products}]}; 
+    return {ids => [map {$_->id} @{Bugzilla->user->get_accessible_products}]};
 }
 
 # Get a list of actual products, based on list of ids or names
 sub get {
-    my ($self, $params) = validate(@_, 'ids', 'names');
+    my ($self, $params) = validate(@_, 'ids', 'names', 'type');
+    my $user = Bugzilla->user;
 
-    defined $params->{ids} || defined $params->{names}
+    defined $params->{ids} || defined $params->{names} || defined $params->{type}
         || ThrowCodeError("params_required", { function => "Product.get",
-                                               params => ['ids', 'names'] });
+                                               params => ['ids', 'names', 'type'] });
     Bugzilla->switch_to_shadow_db();
 
-    # Only products that are in the users accessible products, 
-    # can be allowed to be returned
-    my $accessible_products = Bugzilla->user->get_accessible_products;
+    my $products = [];
+    if (defined $params->{type}) {
+        my %product_hash;
+        my $found = 0;
+        foreach my $type (@{ $params->{type} }) {
+            my $result = [];
+            if ($type eq 'accessible') {
+                $result = $user->get_accessible_products();
+            }
+            elsif ($type eq 'enterable') {
+                $result = $user->get_enterable_products();
+            }
+            elsif ($type eq 'selectable') {
+                $result = $user->get_selectable_products();
+            }
+            else {
+                ThrowUserError('get_products_invalid_type',
+                               { type => $type });
+            }
+            map { $product_hash{$_->id} = $_ } @$result;
+        }
+        $products = [ values %product_hash ];
+    }
+    else {
+        $products = $user->get_accessible_products;
+    }
 
-    my @requested_accessible;
+    my @requested_products;
 
     if (defined $params->{ids}) {
         # Create a hash with the ids the user wants
         my %ids = map { $_ => 1 } @{$params->{ids}};
-        
-        # Return the intersection of this, by grepping the ids from 
-        # accessible products.
-        push(@requested_accessible,
-            grep { $ids{$_->id} } @$accessible_products);
+
+        # Return the intersection of this, by grepping the ids from $products.
+        push(@requested_products,
+            grep { $ids{$_->id} } @$products);
     }
 
     if (defined $params->{names}) {
         # Create a hash with the names the user wants
         my %names = map { lc($_) => 1 } @{$params->{names}};
-        
-        # Return the intersection of this, by grepping the names from 
-        # accessible products, union'ed with products found by ID to
+
+        # Return the intersection of this, by grepping the names
+        # from $products, union'ed with products found by ID to
         # avoid duplicates
         foreach my $product (grep { $names{lc $_->name} }
-                                  @$accessible_products) {
+                                  @$products) {
             next if grep { $_->id == $product->id }
-                         @requested_accessible;
-            push @requested_accessible, $product;
+                         @requested_products;
+            push @requested_products, $product;
         }
     }
 
+    # If we just requested a specific type of products without
+    # specifying ids or names, then return the entire list.
+    if (!defined $params->{ids} && !defined $params->{names}) {
+        @requested_products = @$products;
+    }
+
     # Now create a result entry for each.
     my @products = map { $self->_product_to_hash($params, $_) }
-                       @requested_accessible;
+                       @requested_products;
     return { products => \@products };
 }
 
@@ -115,7 +144,7 @@ sub create {
     my ($self, $params) = @_;
 
     Bugzilla->login(LOGIN_REQUIRED);
-    Bugzilla->user->in_group('editcomponents') 
+    Bugzilla->user->in_group('editcomponents')
         || ThrowUserError("auth_failure", { group  => "editcomponents",
                                             action => "add",
                                             object => "products"});
@@ -151,7 +180,7 @@ sub update {
                                             object => "products" });
 
     defined($params->{names}) || defined($params->{ids})
-        || ThrowCodeError('params_required', 
+        || ThrowCodeError('params_required',
                { function => 'Product.update', params => ['ids', 'names'] });
 
     my $product_objects = params_to_objects($params, 'Bugzilla::Product');
@@ -170,10 +199,10 @@ sub update {
     my %changes;
     foreach my $product (@$product_objects) {
         my $returned_changes = $product->update();
-        $changes{$product->id} = translate($returned_changes, MAPPED_RETURNS);    
+        $changes{$product->id} = translate($returned_changes, MAPPED_RETURNS);
     }
     $dbh->bz_commit_transaction();
-            
+
     my @result;
     foreach my $product (@$product_objects) {
         my %hash = (
@@ -185,7 +214,7 @@ sub update {
             my $change = $changes{$product->id}->{$field};
             $hash{changes}{$field} = {
                 removed => $self->type('string', $change->[0]),
-                added   => $self->type('string', $change->[1]) 
+                added   => $self->type('string', $change->[1])
             };
         }
 
@@ -354,7 +383,7 @@ Returns a list of the ids of the products the user can search on.
 
 =item B<REST>
 
-GET /product?type=selectable
+GET /product_selectable
 
 the returned data format is same as below.
 
@@ -390,7 +419,7 @@ against.
 
 =item B<REST>
 
-GET /product?type=enterable
+GET /product_enterable
 
 the returned data format is same as below.
 
@@ -426,7 +455,7 @@ bugs against.
 
 =item B<REST>
 
-GET /product?type=accessible
+GET /product_accessible
 
 the returned data format is same as below.
 
@@ -465,8 +494,20 @@ B<Note>: Can also be called as "get_products" for compatibilty with Bugzilla 3.0
 
 =item B<REST>
 
+To return information about a specific groups of products such as
+C<accessible>, C<selectable>, or C<enterable>:
+
+GET /product?type=accessible
+
+To return information about a specific product by C<id> or C<name>:
+
 GET /product/<product_id_or_name>
 
+You can also return information about more than one specific product
+by using the following in your query string:
+
+GET /product?ids=1&ids=2&ids=3 or GET /product?names=ProductOne&names=Product2
+
 the returned data format is same as below.
 
 =item B<Params>
@@ -487,9 +528,15 @@ An array of product ids
 
 An array of product names
 
+=item C<type>
+
+The group of products to return. Valid values are: C<accessible> (default),
+C<selectable>, and C<enterable>. C<type> can be a single value or an array
+of values if more than one group is needed with duplicates removed.
+
 =back
 
-=item B<Returns> 
+=item B<Returns>
 
 A hash containing one item, C<products>, that is an array of
 hashes. Each hash describes a product, and has the following items:
@@ -569,7 +616,7 @@ components are not enabled for new bugs.
 
 =item C<flag_types>
 
-A hash containing the two items C<bug> and C<attachment> that each contains an 
+A hash containing the two items C<bug> and C<attachment> that each contains an
 array of hashes, where each hash describes a flagtype, and has the
 following items:
 
@@ -623,8 +670,8 @@ flagtype.
 
 =item C<request_group>
 
-C<int> the group id that is allowed to request the flag if the flag 
-is of the type requestable. If the item is not included all users 
+C<int> the group id that is allowed to request the flag if the flag
+is of the type requestable. If the item is not included all users
 are allowed request this flagtype.
 
 =back
@@ -705,11 +752,11 @@ within Bugzilla.
 
 B<Required> C<string> A description for this product. Allows some simple HTML.
 
-=item C<version> 
+=item C<version>
 
 B<Required> C<string> The default version for this product.
 
-=item C<has_unconfirmed> 
+=item C<has_unconfirmed>
 
 C<boolean> Allow the UNCONFIRMED status to be set on bugs in this product.
 Default: true.
@@ -718,11 +765,11 @@ Default: true.
 
 C<string> The name of the Classification which contains this product.
 
-=item C<default_milestone> 
+=item C<default_milestone>
 
 C<string> The default milestone for this product. Default '---'.
 
-=item C<is_open> 
+=item C<is_open>
 
 C<boolean> True if the product is currently allowing bugs to be entered
 into it. Default: true.
@@ -734,7 +781,7 @@ new product. Default: true.
 
 =back
 
-=item B<Returns>    
+=item B<Returns>
 
 A hash with one element, id. This is the id of the newly-filed product.
 
@@ -878,7 +925,7 @@ Note that booleans will be represented with the strings '1' and '0'.
 
 Here's an example of what a return value might look like:
 
- { 
+ {
    products => [
      {
        id => 123,
diff --git a/Bugzilla/WebService/Server/REST/Resources/Product.pm b/Bugzilla/WebService/Server/REST/Resources/Product.pm
index 1949282e9..acee3887b 100644
--- a/Bugzilla/WebService/Server/REST/Resources/Product.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/Product.pm
@@ -21,17 +21,24 @@ BEGIN {
 
 sub _rest_resources {
     my $rest_resources = [
+        qr{^/product_accessible$}, {
+            GET => {
+                method => 'get_accessible_products'
+            }
+        },
+        qr{^/product_enterable$}, {
+            GET => {
+                method => 'get_enterable_products'
+            }
+        },
+        qr{^/product_selectable$}, {
+            GET => {
+                method => 'get_selectable_products'
+            }
+        },
         qr{^/product$}, {
             GET  => {
-                method => sub {
-                    my $type = Bugzilla->input_params->{type};
-                    return 'get_accessible_products'
-                        if !defined $type || $type eq 'accessible';
-                    return 'get_enterable_products' if $type eq 'enterable';
-                    return 'get_selectable_products' if $type eq 'selectable';
-                    ThrowUserError('rest_get_products_invalid_type',
-                                   { type => $type });
-                },
+                method => 'get'
             },
             POST => {
                 method => 'create',
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index a4c900a22..a52d1833f 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1081,9 +1081,9 @@
   [% ELSIF error == "rest_invalid_resource" %]
     A REST API resource was not found for '[% method FILTER html +%] [%+ path FILTER html %]'.
 
-  [% ELSIF error == "rest_get_products_invalid_type" %]
-    The type '[% type FILTER html %]' is invalid for 'GET /product'. Valid choices
-    are 'accessible' (default if type value is undefined), 'selectable', and 'enterable'.
+  [% ELSIF error == "get_products_invalid_type" %]
+    The product type '[% type FILTER html %]' is invalid. Valid choices
+    are 'accessible', 'selectable', and 'enterable'.
 
   [% ELSIF error == "keyword_already_exists" %]
     [% title = "Keyword Already Exists" %]

From a3e5f80c6297d64c4577f6ffb9aa5698eb0a8693 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 23 Jul 2013 16:26:29 -0400
Subject: [PATCH 129/240] Bug 896066 - Allow REST WebService API to for GET
 /product to allow retrieval of multiple product objects instead of ids

---
 Bugzilla/WebService/Product.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm
index c028c5845..f5a7f953f 100644
--- a/Bugzilla/WebService/Product.pm
+++ b/Bugzilla/WebService/Product.pm
@@ -78,7 +78,6 @@ sub get {
     my $products = [];
     if (defined $params->{type}) {
         my %product_hash;
-        my $found = 0;
         foreach my $type (@{ $params->{type} }) {
             my $result = [];
             if ($type eq 'accessible') {

From ff65f3c352e3e05e3cc9ceb6a571e98d35fecda7 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 24 Jul 2013 16:18:47 +0800
Subject: [PATCH 130/240] Bug 533878: Allow relative date searches involving
 date/time custom fields r=LpSolit, a=sgreen

---
 Bugzilla/Search.pm | 52 +++++++++++++++++++++++++++++++---------------
 t/011pod.t         |  1 +
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 7205f09c5..beca95ae1 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -322,20 +322,31 @@ use constant OPERATOR_FIELD_OVERRIDE => {
 
 # These are fields where special action is taken depending on the
 # *value* passed in to the chart, sometimes.
-use constant SPECIAL_PARSING => {
-    # Pronoun Fields (Ones that can accept %user%, etc.)
-    assigned_to => \&_contact_pronoun,
-    cc          => \&_contact_pronoun,
-    commenter   => \&_contact_pronoun,
-    qa_contact  => \&_contact_pronoun,
-    reporter    => \&_contact_pronoun,
-    'setters.login_name' => \&_contact_pronoun,
-    'requestees.login_name' => \&_contact_pronoun,
+# This is a sub because custom fields are dynamic
+sub SPECIAL_PARSING {
+    my $map = {
+        # Pronoun Fields (Ones that can accept %user%, etc.)
+        assigned_to => \&_contact_pronoun,
+        cc          => \&_contact_pronoun,
+        commenter   => \&_contact_pronoun,
+        qa_contact  => \&_contact_pronoun,
+        reporter    => \&_contact_pronoun,
+        'setters.login_name' => \&_contact_pronoun,
+        'requestees.login_name' => \&_contact_pronoun,
 
-    # Date Fields that accept the 1d, 1w, 1m, 1y, etc. format.
-    creation_ts => \&_timestamp_translate,
-    deadline    => \&_timestamp_translate,
-    delta_ts    => \&_timestamp_translate,
+        # Date Fields that accept the 1d, 1w, 1m, 1y, etc. format.
+        creation_ts => \&_datetime_translate,
+        deadline    => \&_date_translate,
+        delta_ts    => \&_datetime_translate,
+    };
+    foreach my $field (Bugzilla->active_custom_fields) {
+        if ($field->type == FIELD_TYPE_DATETIME) {
+            $map->{$field->name} = \&_datetime_translate;
+        } elsif ($field->type == FIELD_TYPE_DATE) {
+            $map->{$field->name} = \&_date_translate;
+        }
+    }
+    return $map;
 };
 
 # Information about fields that represent "users", used by _user_nonchanged.
@@ -2083,22 +2094,29 @@ sub _word_terms {
 #####################################
 
 sub _timestamp_translate {
-    my ($self, $args) = @_;
+    my ($self, $ignore_time, $args) = @_;
     my $value = $args->{value};
     my $dbh = Bugzilla->dbh;
 
     return if $value !~ /^(?:[\+\-]?\d+[hdwmy]s?|now)$/i;
 
-    # By default, the time is appended to the date, which we don't want
-    # for deadlines.
     $value = SqlifyDate($value);
-    if ($args->{field} eq 'deadline') {
+    # By default, the time is appended to the date, which we don't always want.
+    if ($ignore_time) {
         ($value) = split(/\s/, $value);
     }
     $args->{value} = $value;
     $args->{quoted} = $dbh->quote($value);
 }
 
+sub _datetime_translate {
+    return shift->_timestamp_translate(0, @_);
+}
+
+sub _date_translate {
+    return shift->_timestamp_translate(1, @_);
+}
+
 sub SqlifyDate {
     my ($str) = @_;
     my $fmt = "%Y-%m-%d %H:%M:%S";
diff --git a/t/011pod.t b/t/011pod.t
index 92474d553..0ddd3059d 100644
--- a/t/011pod.t
+++ b/t/011pod.t
@@ -31,6 +31,7 @@ use constant SUB_WHITELIST => (
     'Bugzilla::Flag'     => qr/^(?:(force_)?retarget|force_cleanup)$/,
     'Bugzilla::FlagType' => qr/^sqlify_criteria$/,
     'Bugzilla::JobQueue' => qr/(?:^work_once|subprocess_worker)$/,
+    'Bugzilla::Search'   => qr/^SPECIAL_PARSING$/,
 );
 
 # These modules do not need to be documented, generally because they

From 727a60b3a779e448fa8aed5228cb80b9551acf3b Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 24 Jul 2013 16:33:09 +0800
Subject: [PATCH 131/240] Bug 345194: Add "is empty" and "is not empty" search
 operators to the boolean chart r=LpSolit, a=sgreen

---
 Bugzilla/Search.pm                            | 162 +++++++++++++++++-
 .../en/default/global/field-descs.none.tmpl   |   4 +-
 template/en/default/list/list.html.tmpl       |   2 +-
 .../default/search/boolean-charts.html.tmpl   |   2 +
 4 files changed, 167 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index beca95ae1..557acec74 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -160,6 +160,8 @@ use constant OPERATORS => {
     changedfrom    => \&_changedfrom_changedto,
     changedto      => \&_changedfrom_changedto,
     changedby      => \&_changedby,
+    isempty        => \&_isempty,
+    isnotempty     => \&_isnotempty,
 };
 
 # Some operators are really just standard SQL operators, and are
@@ -186,6 +188,8 @@ use constant OPERATOR_REVERSE => {
     lessthaneq     => 'greaterthan',
     greaterthan    => 'lessthaneq',
     greaterthaneq  => 'lessthan',
+    isempty        => 'isnotempty',
+    isnotempty     => 'isempty',
     # The following don't currently have reversals:
     # casesubstring, anyexact, allwords, allwordssubstr
 };
@@ -201,6 +205,12 @@ use constant NON_NUMERIC_OPERATORS => qw(
     notregexp
 );
 
+# These operators ignore the entered value
+use constant NO_VALUE_OPERATORS => qw(
+    isempty
+    isnotempty
+);
+
 use constant MULTI_SELECT_OVERRIDE => {
     notequals      => \&_multiselect_negative,
     notregexp      => \&_multiselect_negative,
@@ -1713,6 +1723,8 @@ sub _boolean_charts {
                 my $field = $params->{"field$identifier"};
                 my $operator = $params->{"type$identifier"};
                 my $value = $params->{"value$identifier"};
+                # no-value operators ignore the value, however a value needs to be set
+                $value = ' ' if $operator && grep { $_ eq $operator } NO_VALUE_OPERATORS;
                 $or_clause->add($field, $operator, $value);
             }
             $and_clause->add($or_clause);
@@ -1759,6 +1771,8 @@ sub _custom_search {
         
         my $operator = $params->{"o$id"};
         my $value = $params->{"v$id"};
+        # no-value operators ignore the value, however a value needs to be set
+        $value = ' ' if $operator && grep { $_ eq $operator } NO_VALUE_OPERATORS;
         my $condition = condition($field, $operator, $value);
         $condition->negate($params->{"n$id"});
         $current_clause->add($condition);
@@ -2365,7 +2379,7 @@ sub _user_nonchanged {
         # For negative operators, the system we're using here
         # only works properly if we reverse the operator and check IS NULL
         # in the WHERE.
-        my $is_negative = $operator =~ /^no/ ? 1 : 0;
+        my $is_negative = $operator =~ /^(?:no|isempty)/ ? 1 : 0;
         if ($is_negative) {
             $args->{operator} = $self->_reverse_operator($operator);
         }
@@ -2447,6 +2461,11 @@ sub _long_desc_nonchanged {
     my ($self, $args) = @_;
     my ($chart_id, $operator, $value, $joins, $bugs_table) =
         @$args{qw(chart_id operator value joins bugs_table)};
+
+    if ($operator =~ /^is(not)?empty$/) {
+        $args->{term} = $self->_multiselect_isempty($args, $operator eq 'isnotempty');
+        return;
+    }
     my $dbh = Bugzilla->dbh;
 
     my $table = "longdescs_$chart_id";
@@ -2746,6 +2765,12 @@ sub _flagtypes_nonchanged {
     my ($self, $args) = @_;
     my ($chart_id, $operator, $value, $joins, $bugs_table, $condition) =
         @$args{qw(chart_id operator value joins bugs_table condition)};
+
+    if ($operator =~ /^is(not)?empty$/) {
+        $args->{term} = $self->_multiselect_isempty($args, $operator eq 'isnotempty');
+        return;
+    }
+
     my $dbh = Bugzilla->dbh;
 
     # For 'not' operators, we need to negate the whole term.
@@ -2862,6 +2887,10 @@ sub _multiselect_table {
 
 sub _multiselect_term {
     my ($self, $args, $not) = @_;
+    my ($operator) = $args->{operator};
+    # 'empty' operators require special handling
+    return $self->_multiselect_isempty($args, $not)
+        if $operator =~ /^is(not)?empty$/;
     my $table = $self->_multiselect_table($args);
     $self->_do_operator_function($args);
     my $term = $args->{term};
@@ -2870,6 +2899,116 @@ sub _multiselect_term {
     return build_subselect("$args->{bugs_table}.bug_id", $select, $table, $term, $not);
 }
 
+# We can't use the normal operator_functions to build isempty queries which
+# join to different tables.
+sub _multiselect_isempty {
+    my ($self, $args, $not) = @_;
+    my ($field, $operator, $joins, $chart_id) = @$args{qw(field operator joins chart_id)};
+    my $dbh = Bugzilla->dbh;
+    $operator = $self->_reverseoperator($operator) if $not;
+    $not = $operator eq 'isnotempty' ? 'NOT' : '';
+
+    if ($field eq 'keywords') {
+        push @$joins, {
+            table => 'keywords',
+            as    => "keywords_$chart_id",
+            from  => 'bug_id',
+            to    => 'bug_id',
+        };
+        return "keywords_$chart_id.bug_id IS $not NULL";
+    }
+    elsif ($field eq 'bug_group') {
+        push @$joins, {
+            table => 'bug_group_map',
+            as    => "bug_group_map_$chart_id",
+            from  => 'bug_id',
+            to    => 'bug_id',
+        };
+        return "bug_group_map_$chart_id.bug_id IS $not NULL";
+    }
+    elsif ($field eq 'flagtypes.name') {
+        push @$joins, {
+            table => 'flags',
+            as    => "flags_$chart_id",
+            from  => 'bug_id',
+            to    => 'bug_id',
+        };
+        return "flags_$chart_id.bug_id IS $not NULL";
+    }
+    elsif ($field eq 'blocked' or $field eq 'dependson') {
+        my $to = $field eq 'blocked' ? 'dependson' : 'blocked';
+        push @$joins, {
+            table => 'dependencies',
+            as    => "dependencies_$chart_id",
+            from  => 'bug_id',
+            to    => $to,
+        };
+        return "dependencies_$chart_id.$to IS $not NULL";
+    }
+    elsif ($field eq 'longdesc') {
+        my @extra = ( "longdescs_$chart_id.type != " . CMT_HAS_DUPE );
+        push @extra, "longdescs_$chart_id.isprivate = 0"
+            unless $self->_user->is_insider;
+        push @$joins, {
+            table => 'longdescs',
+            as    => "longdescs_$chart_id",
+            from  => 'bug_id',
+            to    => 'bug_id',
+            extra => \@extra,
+        };
+        return $not
+            ? "longdescs_$chart_id.thetext != ''"
+            : "longdescs_$chart_id.thetext = ''";
+    }
+    elsif ($field eq 'longdescs.isprivate') {
+        ThrowUserError('search_field_operator_invalid', { field  => $field,
+                                                          operator => $operator });
+    }
+    elsif ($field =~ /^attachments\.(.+)/) {
+        my $sub_field = $1;
+        if ($sub_field eq 'description' || $sub_field eq 'filename' || $sub_field eq 'mimetype') {
+            # can't be null/empty
+            return $not ? '1=1' : '1=2';
+        } else {
+            # all other fields which get here are boolean
+            ThrowUserError('search_field_operator_invalid', { field => $field,
+                                                              operator => $operator });
+        }
+    }
+    elsif ($field eq 'attach_data.thedata') {
+        push @$joins, {
+            table => 'attachments',
+            as    => "attachments_$chart_id",
+            from  => 'bug_id',
+            to    => 'bug_id',
+            extra => [ $self->_user->is_insider ? '' : "attachments_$chart_id.isprivate = 0" ],
+        };
+        push @$joins, {
+            table => 'attach_data',
+            as    => "attach_data_$chart_id",
+            from  => "attachments_$chart_id.attach_id",
+            to    => 'id',
+        };
+        return "attach_data_$chart_id.thedata IS $not NULL";
+    }
+    elsif ($field eq 'tag') {
+        push @$joins, {
+            table => 'bug_tag',
+            as    => "bug_tag_$chart_id",
+            from  => 'bug_id',
+            to    => 'bug_id',
+        };
+        push @$joins, {
+            table => 'tag',
+            as    => "tag_$chart_id",
+            from  => "bug_tag_$chart_id.tag_id",
+            to    => 'id',
+            extra => [ "tag_$chart_id.user_id = " . ($self->_sharer_id || $self->_user->id) ],
+        };
+        return "tag_$chart_id.id IS $not NULL";
+    }
+}
+
 ###############################
 # Standard Operator Functions #
 ###############################
@@ -3086,6 +3225,27 @@ sub _changed_security_check {
     }
 }
 
+sub _isempty {
+    my ($self, $args) = @_;
+    my $full_field = $args->{full_field};
+    $args->{term} = "$full_field IS NULL OR $full_field = " . $self->_empty_value($args->{field});
+}
+
+sub _isnotempty {
+    my ($self, $args) = @_;
+    my $full_field = $args->{full_field};
+    $args->{term} = "$full_field IS NOT NULL AND $full_field != " . $self->_empty_value($args->{field});
+}
+
+sub _empty_value {
+    my ($self, $field) = @_;
+    my $field_obj = $self->_chart_fields->{$field};
+    return "0" if $field_obj->type == FIELD_TYPE_BUG_ID;
+    return Bugzilla->dbh->quote(EMPTY_DATETIME) if $field_obj->type == FIELD_TYPE_DATETIME;
+    return Bugzilla->dbh->quote(EMPTY_DATE) if $field_obj->type == FIELD_TYPE_DATE;
+    return "''";
+}
+
 ######################
 # Public Subroutines #
 ######################
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 948ee5efa..34c4dc9ed 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -34,7 +34,9 @@
   "changedto"      => "changed to",
   "changedby"      => "changed by",
   "matches"        => "matches",
-  "notmatches"      => "does not match",
+  "notmatches"     => "does not match",
+  "isempty"        => "is empty",
+  "isnotempty"     => "is not empty",
 } %]
 
 [% field_types = { ${constants.FIELD_TYPE_UNKNOWN}       => "Unknown Type",
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index dcc140cf2..6e1755fed 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -103,7 +103,7 @@
   'notequals', 'regexp', 'notregexp', 'lessthan', 'lessthaneq', 
   'greaterthan', 'greaterthaneq', 'changedbefore', 'changedafter', 
   'changedfrom', 'changedto', 'changedby', 'notsubstring', 'nowords',
-  'nowordssubstr', 'notmatches',
+  'nowordssubstr', 'notmatches', 'isempty', 'isnotempty'
 ] %]
 <a id="search_description_controller" class="bz_default_hidden"
    href="javascript:TUI_toggle_class('search_description')">Hide Search Description</a>
diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index 508e11c65..901de0501 100644
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -33,6 +33,8 @@
   "changedby",
   "matches",
   "notmatches",
+  "isempty",
+  "isnotempty",
 ] %]
 
 <div class="bz_section_title" id="custom_search_filter">

From 482c23af7f0159ae914a05ed19a5288d5b124265 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 24 Jul 2013 16:59:42 +0800
Subject: [PATCH 132/240] Bug 345194: fix for xt tests

---
 xt/lib/Bugzilla/Test/Search/Constants.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm
index 24a67e89d..5d84ec6ff 100644
--- a/xt/lib/Bugzilla/Test/Search/Constants.pm
+++ b/xt/lib/Bugzilla/Test/Search/Constants.pm
@@ -947,6 +947,9 @@ use constant TESTS => {
           },
         },
     ],
+    # XXX these need tests developed
+    isempty => [],
+    isnotempty => [],
 };
 
 # Fields that do not behave as we expect, for InjectionTest.
@@ -995,6 +998,8 @@ use constant INJECTION_BROKEN_OPERATOR => {
     changedafter  => { search => 1, field_ok => ['creation_ts'] },
     changedbefore => { search => 1, field_ok => ['creation_ts'] },
     changedby     => { search => 1 },
+    isempty       => { search => 1 },
+    isnotempty    => { search => 1 },
 };
 
 # Tests run by Bugzilla::Test::Search::InjectionTest.

From a57e3bfb7ae919e2493a2d0b0ff31cb8184e6c92 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 24 Jul 2013 10:12:03 -0400
Subject: [PATCH 133/240] Bug 880653 - Add POD for Bug.possible_duplicates
 webservice r=LpSolit,a=sgreen

---
 Bugzilla/WebService/Bug.pm | 55 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 391ea69bc..9c4906883 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -2301,6 +2301,59 @@ names used by L<Bug.update|/"update"> for consistency.
 
 =back
 
+=head2 possible_duplicates
+
+B<UNSTABLE>
+
+=over
+
+=item B<Description>
+
+Allows a user to find possible duplicate bugs based on a set of keywords
+such as a user may use as a bug summary. Optionally the search can be
+narrowed down to specific products.
+
+=item B<Params>
+
+=over
+
+=item C<summary> (string) B<Required> - A string of keywords defining
+the type of bug you are trying to report.
+
+=item C<products> (array) - One or more product names to narrow the
+duplicate search to. If omitted, all bugs are searched.
+
+=back
+
+=item B<Returns>
+
+The same as L</get>.
+
+Note that you will only be returned information about bugs that you
+can see. Bugs that you can't see will be entirely excluded from the
+results. So, if you want to see private bugs, you will have to first 
+log in and I<then> call this method.
+
+=item B<Errors>
+
+=over
+
+=item 50 (Param Required)
+
+You must specify a value for C<summary> containing a string of keywords to 
+search for duplicates.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.0>.
+
+=back
+
+=back
 
 =head2 search
 
@@ -3592,8 +3645,6 @@ This method can throw the same errors as L</get>.
 
 =item get_bugs
 
-=item possible_duplicates
-
 =item get_history
 
 =back

From 9d1844a130c940bce6f1bf2d436babbfc59af1ac Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 24 Jul 2013 15:01:21 -0400
Subject: [PATCH 134/240] Bug 895309 - comments returned via the REST endpoint
 shouldn't be wrapped r/a=glob

---
 Bugzilla/Template.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index f70224a9c..0811d84d2 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -834,8 +834,10 @@ sub create {
                 # and causes awkward things like \n's appearing in error
                 # messages in JSON-RPC.)
                 unless (Bugzilla->usage_mode == USAGE_MODE_JSON
-                        or Bugzilla->usage_mode == USAGE_MODE_XMLRPC)
+                        or Bugzilla->usage_mode == USAGE_MODE_XMLRPC
+                        or Bugzilla->usage_mode == USAGE_MODE_REST)
                 {
+                    print STDERR "var: $var";
                     $var = wrap_comment($var, 72);
                 }
                 $var =~ s/\&nbsp;/ /g;

From f1de0be9077c9842c944b3c95a933ce0470f7931 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 24 Jul 2013 15:43:03 -0400
Subject: [PATCH 135/240] Bug 875728 - Need hook for links in common-links
 r=rojanu,a=sgreen

---
 template/en/default/global/common-links.html.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index 800fd5932..c6c8863c5 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -49,6 +49,8 @@
     [% END %]
   [%-# Work around FF bug: keep this on one line %]</li>
 
+  [% Hook.process('action-links') %]
+
   [% IF user.login %]
     <li><span class="separator">| </span><a href="userprefs.cgi">Preferences</a></li>
     [% IF user.in_group('tweakparams') || user.in_group('editusers') || user.can_bless

From 84f8ded822a0de2dc4c20c2567bd06b3a2ecf290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 25 Jul 2013 01:40:18 +0200
Subject: [PATCH 136/240] Bug 896298: Bugzilla::JobQueue requires TheSchwartz
 1.07 to use the prioritization of jobs r=gerv a=glob

---
 Bugzilla/Install/Requirements.pm                  | 3 ++-
 template/en/default/pages/release-notes.html.tmpl | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 4b59838f8..b6e3f9033 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -346,7 +346,8 @@ sub OPTIONAL_MODULES {
     {
         package => 'TheSchwartz',
         module  => 'TheSchwartz',
-        version => 0,
+        # 1.07 supports the prioritization of jobs.
+        version => 1.07,
         feature => ['jobqueue'],
     },
     {
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 6fc7ddbbd..c2e68bafe 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -91,6 +91,7 @@
 [% INCLUDE req_table reqs = OPTIONAL_MODULES
                      new  = ['Net-SMTP-SSL', 'HTML-FormatText-WithLinks',
                              'File-MimeInfo', 'IO-stringy']
+                     updated = ['TheSchwartz']
                      include_feature = 1 %]
 
 <h3 id="v44_req_apache">Optional Apache Modules</h3>

From c0a33b64656896f4e0452bc45dc2125da5dd54fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 25 Jul 2013 01:44:09 +0200
Subject: [PATCH 137/240] Bug 897426: Revert the hack in Bugzilla->feature and
 make it more robust r/a=glob

---
 Bugzilla.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index eb1c2f8ea..2c0e303d9 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -232,12 +232,7 @@ sub feature {
 
     my $success = 1;
     foreach my $module (@{ $feature_map->{$feature} }) {
-        # We can't use a string eval and "use" here (it kills Template-Toolkit,
-        # see https://rt.cpan.org/Public/Bug/Display.html?id=47929), so we have
-        # to do a block eval.
-        $module =~ s{::}{/}g;
-        $module .= ".pm";
-        eval { require $module; 1; } or $success = 0;
+        eval "require $module" or $success = 0;
     }
     $cache->{feature}->{$feature} = $success;
     return $success;

From 5c7d7618eddd9a6a5ac2a69841d6b15500a7d9a2 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Thu, 25 Jul 2013 14:28:54 +1000
Subject: [PATCH 138/240] Bug 880113 - Use the cache for the product and
 component name r=LpSolit, a=glob

---
 Bugzilla/Bug.pm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 40acca871..f27baa532 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3288,11 +3288,8 @@ sub cc_users {
 
 sub component {
     my ($self) = @_;
-    return $self->{component} if exists $self->{component};
     return '' if $self->{error};
-    ($self->{component}) = Bugzilla->dbh->selectrow_array(
-        'SELECT name FROM components WHERE id = ?',
-        undef, $self->{component_id});
+    $self->{component} //= $self->component_obj->name;
     return $self->{component};
 }
 
@@ -3492,11 +3489,8 @@ sub percentage_complete {
 
 sub product {
     my ($self) = @_;
-    return $self->{product} if exists $self->{product};
     return '' if $self->{error};
-    ($self->{product}) = Bugzilla->dbh->selectrow_array(
-        'SELECT name FROM products WHERE id = ?',
-        undef, $self->{product_id});
+    $self->{product} //= $self->product_obj->name;
     return $self->{product};
 }
 

From 9542c45e3f32621e5ab0c0d319b402d737caa650 Mon Sep 17 00:00:00 2001
From: Pami Ketolainen <pami.ketolainen@jollamobile.com>
Date: Thu, 25 Jul 2013 13:00:08 +0200
Subject: [PATCH 139/240] Bug 889403: syncLDAP.pl does not rederive regexp
 groups when updating login name r=LpSolit a=sgreen

---
 contrib/syncLDAP.pl | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/contrib/syncLDAP.pl b/contrib/syncLDAP.pl
index ec0839ed5..6ad96477b 100755
--- a/contrib/syncLDAP.pl
+++ b/contrib/syncLDAP.pl
@@ -240,22 +240,15 @@ if($readonly == 0) {
    
    print "Phase 2: updating existing users... " unless $quiet;
 
-   my $sth_update_login = $dbh->prepare(
-       'UPDATE profiles
-           SET login_name = ? 
-         WHERE ' . $dbh->sql_istrcmp('login_name', '?'));
-   my $sth_update_realname = $dbh->prepare(
-       'UPDATE profiles
-           SET realname = ? 
-         WHERE ' . $dbh->sql_istrcmp('login_name', '?'));
-
    if($noupdate == 0) {
       while( my ($key, $value) = each(%update_users) ) {
+        my $user = Bugzilla::User->check($key);
         if(defined $value->{'new_login_name'}) {
-          $sth_update_login->execute($value->{'new_login_name'}, $key);
+          $user->set_login($value->{'new_login_name'});
         } else {
-          $sth_update_realname->execute($value->{'realname'}, $key);
+          $user->set_name($value->{'realname'});
         }
+        $user->update();
       }
       print "done!\n" unless $quiet;
    }

From 3fe11b3196391bc3929d1fb7a5ce4b9a4e1adfd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 25 Jul 2013 15:12:37 +0200
Subject: [PATCH 140/240] Remove debug code

---
 Bugzilla/Template.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 0811d84d2..a8f614387 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -837,7 +837,6 @@ sub create {
                         or Bugzilla->usage_mode == USAGE_MODE_XMLRPC
                         or Bugzilla->usage_mode == USAGE_MODE_REST)
                 {
-                    print STDERR "var: $var";
                     $var = wrap_comment($var, 72);
                 }
                 $var =~ s/\&nbsp;/ /g;

From a83257ac427422d787a7e57db253b7313bb2c68b Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 25 Jul 2013 17:03:04 -0400
Subject: [PATCH 141/240] Bug 896183 - Change password screen mentions "New
 Password Again" it should be "Confirm new password" r=dkl,a=sgreen

---
 .../default/account/password/set-forgotten-password.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl
index 76c4b3f53..55b97addc 100644
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -18,7 +18,7 @@
   <input type="hidden" name="a" value="chgpw">
   <table>
     <tr>
-      <th>New Password:</th>
+      <th>New password:</th>
       <td>
         <input type="password" name="password">
         (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters)
@@ -26,7 +26,7 @@
     </tr>
     
     <tr>
-      <th>New Password Again:</th>
+      <th>Confirm new password:</th>
       <td>
         <input type="password" name="matchpassword">
       </td>

From 98c2bb675b2a0d652df2f1b397a2dbc1e3a2b8cc Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Fri, 26 Jul 2013 09:57:44 +1000
Subject: [PATCH 142/240] Bug 880093 - Cache filter_wants r=glob, a=glob

---
 Bugzilla/WebService/Util.pm | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index d2a8de85c..c24f95923 100644
--- a/Bugzilla/WebService/Util.pm
+++ b/Bugzilla/WebService/Util.pm
@@ -38,28 +38,38 @@ sub filter ($$;$) {
 
 sub filter_wants ($$;$) {
     my ($params, $field, $prefix) = @_;
+
+    # Since this is operation is resource intensive, we will cache the results
+    # This assumes that $params->{*_fields} doesn't change between calls
+    my $cache = Bugzilla->request_cache->{filter_wants} ||= {};
+    $field = "${prefix}.${field}" if $prefix;
+
+    if (exists $cache->{$field}) {
+        return $cache->{$field};
+    }
+
     my %include = map { $_ => 1 } @{ $params->{'include_fields'} || [] };
     my %exclude = map { $_ => 1 } @{ $params->{'exclude_fields'} || [] };
 
-    $field = "${prefix}.${field}" if $prefix;
-
+    my $wants = 1;
     if (defined $params->{exclude_fields} && $exclude{$field}) {
-        return 0;
+        $wants = 0;
     }
-    if (defined $params->{include_fields} && !$include{$field}) {
+    elsif (defined $params->{include_fields} && !$include{$field}) {
         if ($prefix) {
             # Include the field if the parent is include (and this one is not excluded)
-            return 0 if !$include{$prefix};
+            $wants = 0 if !$include{$prefix};
         }
         else {
             # We want to include this if one of the sub keys is included
             my $key = $field . '.';
             my $len = length($key);
-            return 0 if ! grep { substr($_, 0, $len) eq $key  } keys %include;
+            $wants = 0 if ! grep { substr($_, 0, $len) eq $key  } keys %include;
         }
     }
 
-    return 1;
+    $cache->{$field} = $wants;
+    return $wants;
 }
 
 sub taint_data {

From 7f95b69005846c021bcefce27c525b869101b9bd Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Fri, 26 Jul 2013 10:05:17 +1000
Subject: [PATCH 143/240] Bug 893618 - Bug status anchor different on create
 and modify bug page r=LpSolit, a=glob

---
 template/en/default/bug/edit.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 8a3a6082c..54e1cdb7a 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -297,7 +297,7 @@
 [% BLOCK section_status %]
   <tr>
     <th class="field_label">
-      <a href="page.cgi?id=fields.html#status">Status</a>:
+      <a href="page.cgi?id=fields.html#bug_status">Status</a>:
     </th>
     <td id="bz_field_status">
       <span id="static_bug_status">
@@ -1105,7 +1105,7 @@
                class="status" cellspacing="0" cellpadding="0">
           <tr>
             <th class="field_label">
-              <a href="page.cgi?id=fields.html#status">Status</a>:
+              <a href="page.cgi?id=fields.html#bug_status">Status</a>:
             </th>
             <td>
               [% PROCESS bug/knob.html.tmpl %]

From f5a57d700cbcb1e043a25daa8813c3a14c053b86 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Fri, 26 Jul 2013 18:07:54 -0400
Subject: [PATCH 144/240] Bug 494675 - Message describing steps after user
 requests to change email address is confusing r=dkl,a=sgreen

---
 template/en/default/account/prefs/prefs.html.tmpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 4416c95dd..ae3f9c842 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -63,8 +63,9 @@
 
     [% IF email_changes_saved %]
       <p>
-        An email has been sent to both old and new email
-        addresses to confirm the change of email address.
+        In order to confirm your request, we have sent an email to your
+        new email address. As a precaution, an email has also been sent
+        to your old address allowing you to cancel this change if needed.
       </p>
     [% END %]
   </div>

From 80730dd587b4a93a011ac29cbd4a10cd7319dd39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 29 Jul 2013 12:35:28 +0200
Subject: [PATCH 145/240] Bug 897003: Improve _strip_undefs() performance
 r/a=sgreen

---
 Bugzilla/WebService/Server/XMLRPC.pm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm
index eab718efc..93c9b4cdc 100644
--- a/Bugzilla/WebService/Server/XMLRPC.pm
+++ b/Bugzilla/WebService/Server/XMLRPC.pm
@@ -211,7 +211,7 @@ package Bugzilla::XMLRPC::Serializer;
 use 5.10.1;
 use strict;
 
-use Scalar::Util qw(blessed);
+use Scalar::Util qw(blessed reftype);
 # We can't use "use parent" because XMLRPC::Serializer doesn't return
 # a true value.
 use XMLRPC::Lite;
@@ -245,8 +245,8 @@ sub envelope {
     my $self = shift;
     my ($type, $method, $data) = @_;
     # If the type isn't a successful response we don't want to change the values.
-    if ($type eq 'response'){
-        $data = _strip_undefs($data);
+    if ($type eq 'response') {
+        _strip_undefs($data);
     }
     return $self->SUPER::envelope($type, $method, $data);
 }
@@ -257,7 +257,9 @@ sub envelope {
 # so it cannot be recursed like the other hash type objects.
 sub _strip_undefs {
     my ($initial) = @_;
-    if (ref $initial eq "HASH" || (blessed $initial && $initial->isa("HASH"))) {
+    my $type = reftype($initial) or return;
+
+    if ($type eq "HASH") {
         while (my ($key, $value) = each(%$initial)) {
             if ( !defined $value
                  || (blessed $value && $value->isa('XMLRPC::Data') && !defined $value->value) )
@@ -266,11 +268,11 @@ sub _strip_undefs {
                 delete $initial->{$key};
             }
             else {
-                $initial->{$key} = _strip_undefs($value);
+                _strip_undefs($value);
             }
         }
     }
-    if (ref $initial eq "ARRAY" || (blessed $initial && $initial->isa("ARRAY"))) {
+    elsif ($type eq "ARRAY") {
         for (my $count = 0; $count < scalar @{$initial}; $count++) {
             my $value = $initial->[$count];
             if ( !defined $value
@@ -281,11 +283,10 @@ sub _strip_undefs {
                 $count--;
             }
             else {
-                $initial->[$count] = _strip_undefs($value);
+                _strip_undefs($value);
             }
         }
     }
-    return $initial;
 }
 
 sub BEGIN {

From 56a4dd524a38e619a3fb6181def8812726e5e6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 30 Jul 2013 11:15:15 +0200
Subject: [PATCH 146/240] Bug 897029: Preload bug permissions when calling
 Bug.get to improve performance r/a=sgreen

---
 Bugzilla/WebService/Bug.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 9c4906883..c639084ef 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -323,6 +323,12 @@ sub get {
 
     my @bugs;
     my @faults;
+
+    # Cache permissions for bugs. This highly reduces the number of calls to the DB.
+    # visible_bugs() is only able to handle bug IDs, so we have to skip aliases.
+    my @int = grep { $_ =~ /^\d+$/ } @$ids;
+    Bugzilla->user->visible_bugs(\@int);
+
     foreach my $bug_id (@$ids) {
         my $bug;
         if ($params->{permissive}) {

From b79fc231152961aa853ee8b20047e86545dab09d Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 30 Jul 2013 10:34:14 -0400
Subject: [PATCH 147/240] Bug 237516 - confusing cancellation message for
 tokens r=dkl,a=sgreen

---
 template/en/default/account/cancel-token.txt.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index 4d9cb9a90..483947ec9 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -11,7 +11,7 @@ To: [% emailaddress %]
 Subject: [% PROCESS subject %]
 X-Bugzilla-Type: admin
 
-A request was canceled from [% remoteaddress %].
+[% PROCESS subject %] from [% remoteaddress %].
 
 If you did not request this, it could be either an honest
 mistake or someone attempting to break into your [% terms.Bugzilla %] account.

From 8bb59c3f5ce76ebd142dc0ba41231e589f570fff Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 30 Jul 2013 12:31:24 -0400
Subject: [PATCH 148/240] Bug 856736 - Set X-Bugzilla-Type to dep_changed for
 'dependency changed" bugmail r/a=sgreen

---
 Bugzilla/BugMail.pm                               | 15 +++++++++++----
 template/en/default/email/bugmail-header.txt.tmpl |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index ee25613b7..1169e94a7 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -257,6 +257,7 @@ sub Send {
                                   $watching{$user_id} : undef,
                       diffs    => \@diffs,
                       rels_which_want => \%rels_which_want,
+                      dep_only => $params->{dep_only}
                     });
                 push(@sent, $user->login) if $sent_mail;
             }
@@ -277,7 +278,7 @@ sub Send {
 
 sub sendMail {
     my $params = shift;
-    
+
     my $user   = $params->{to};
     my $bug    = $params->{bug};
     my @send_comments = @{ $params->{comments} };
@@ -286,13 +287,14 @@ sub sendMail {
     my $watchingRef = $params->{watchers};
     my @diffs = @{ $params->{diffs} };
     my $relRef      = $params->{rels_which_want};
+    my $dep_only = $params->{dep_only};
 
     # Only display changes the user is allowed see.
     my @display_diffs;
 
     foreach my $diff (@diffs) {
         my $add_diff = 0;
-        
+
         if (grep { $_ eq $diff->{field_name} } TIMETRACKING_FIELDS) {
             $add_diff = 1 if $user->is_timetracker;
         }
@@ -325,13 +327,17 @@ sub sendMail {
     push @watchingrel, map { user_id_to_login($_) } @$watchingRef;
 
     my @changedfields = uniq map { $_->{field_name} } @display_diffs;
-    
+
     # Add attachments.created to changedfields if one or more
     # comments contain information about a new attachment
     if (grep($_->type == CMT_ATTACHMENT_CREATED, @send_comments)) {
         push(@changedfields, 'attachments.created');
     }
 
+    my $bugmailtype = "changed";
+    $bugmailtype = "new" if !$bug->lastdiffed;
+    $bugmailtype = "dep_changed" if $dep_only;
+
     my $vars = {
         date => $date,
         to_user => $user,
@@ -342,9 +348,10 @@ sub sendMail {
         reasonswatchheader => join(" ", @watchingrel),
         changer => $changer,
         diffs => \@display_diffs,
-        changedfields => \@changedfields, 
+        changedfields => \@changedfields,
         new_comments => \@send_comments,
         threadingmarker => build_thread_marker($bug->id, $user->id, !$bug->lastdiffed),
+        bugmailtype => $bugmailtype
     };
     my $msg =  _generate_bugmail($user, $vars);
     MessageToMTA($msg);
diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
index f9cdbd814..286c70bcd 100644
--- a/template/en/default/email/bugmail-header.txt.tmpl
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -16,7 +16,7 @@ To: [% to_user.email %]
 Subject: [[% terms.Bug %] [%+ bug.id %]] [% 'New: ' IF show_new %][%+ bug.short_desc %]
 Date: [% date %]
 X-Bugzilla-Reason: [% reasonsheader %]
-X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
+X-Bugzilla-Type: [% bugmailtype %]
 X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
 [%+ INCLUDE "email/header-common.txt.tmpl" %]
 X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %]

From cb6c05ec7564b7b5b9398a673b1caace9203fa32 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 30 Jul 2013 13:27:36 -0400
Subject: [PATCH 149/240] Bug 402745 - Improve the error message displayed when
 accessing summarize_time.cgi with no bug ID

---
 summarize_time.cgi                              | 2 +-
 template/en/default/global/user-error.html.tmpl | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/summarize_time.cgi b/summarize_time.cgi
index d77634da5..0d32d16e4 100755
--- a/summarize_time.cgi
+++ b/summarize_time.cgi
@@ -254,7 +254,7 @@ $user->is_timetracker
 
 my @ids = split(",", $cgi->param('id') || '');
 @ids = map { Bugzilla::Bug->check($_)->id } @ids;
-scalar(@ids) || ThrowUserError('no_bugs_chosen', {action => 'view'});
+scalar(@ids) || ThrowUserError('no_bugs_chosen', {action => 'summarize'});
 
 my $group_by = $cgi->param('group_by') || "number";
 my $monthly = $cgi->param('monthly');
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index a52d1833f..65fb4f18a 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1287,6 +1287,8 @@
       to modify.
     [% ELSIF action == "view" %]
       to view.
+    [% ELSIF action == 'summarize' %]
+      for viewing time summaries.
     [% END %]
 
   [% ELSIF error == "no_tag_to_edit" %]

From 84e213bd2d6af12f6af19438b089a7f30ac51ba4 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 31 Jul 2013 13:20:07 +0800
Subject: [PATCH 150/240] Bug 877078: shift bugmail generation to the jobqueue
 r=sgreen, a=sgreen

---
 Bugzilla/BugMail.pm     | 99 ++++++++++++++++++++++++++++++++++-------
 Bugzilla/Job/BugMail.pm | 31 +++++++++++++
 Bugzilla/Job/Mailer.pm  | 10 -----
 Bugzilla/JobQueue.pm    |  1 +
 Bugzilla/Object.pm      | 50 ++++++++++++++++++++-
 t/011pod.t              |  1 +
 6 files changed, 164 insertions(+), 28 deletions(-)
 create mode 100644 Bugzilla/Job/BugMail.pm

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 1169e94a7..e84a370c0 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -23,6 +23,7 @@ use Date::Parse;
 use Date::Format;
 use Scalar::Util qw(blessed);
 use List::MoreUtils qw(uniq);
+use Storable qw(dclone);
 
 use constant BIT_DIRECT    => 1;
 use constant BIT_WATCHING  => 2;
@@ -339,31 +340,76 @@ sub sendMail {
     $bugmailtype = "dep_changed" if $dep_only;
 
     my $vars = {
-        date => $date,
-        to_user => $user,
-        bug => $bug,
-        reasons => \@reasons,
-        reasons_watch => \@reasons_watch,
-        reasonsheader => join(" ", @headerrel),
+        date               => $date,
+        to_user            => $user,
+        bug                => $bug,
+        reasons            => \@reasons,
+        reasons_watch      => \@reasons_watch,
+        reasonsheader      => join(" ", @headerrel),
         reasonswatchheader => join(" ", @watchingrel),
-        changer => $changer,
-        diffs => \@display_diffs,
-        changedfields => \@changedfields,
-        new_comments => \@send_comments,
-        threadingmarker => build_thread_marker($bug->id, $user->id, !$bug->lastdiffed),
-        bugmailtype => $bugmailtype
+        changer            => $changer,
+        diffs              => \@display_diffs,
+        changedfields      => \@changedfields,
+        new_comments       => \@send_comments,
+        threadingmarker    => build_thread_marker($bug->id, $user->id, !$bug->lastdiffed),
+        bugmailtype        => $bugmailtype,
     };
-    my $msg =  _generate_bugmail($user, $vars);
-    MessageToMTA($msg);
+    if (Bugzilla->params->{'use_mailer_queue'}) {
+        enqueue($vars);
+    } else {
+        MessageToMTA(_generate_bugmail($vars));
+    }
 
     return 1;
 }
 
+sub enqueue {
+    my ($vars) = @_;
+    # we need to flatten all objects to a hash before pushing to the job queue.
+    # the hashes need to be inflated in the dequeue method.
+    $vars->{bug}          = _flatten_object($vars->{bug});
+    $vars->{to_user}      = $vars->{to_user}->flatten_to_hash;
+    $vars->{changer}      = _flatten_object($vars->{changer});
+    $vars->{new_comments} = [ map { _flatten_object($_) } @{ $vars->{new_comments} } ];
+    foreach my $diff (@{ $vars->{diffs} }) {
+        $diff->{who} = _flatten_object($diff->{who});
+    }
+    Bugzilla->job_queue->insert('bug_mail', { vars => $vars });
+}
+
+sub dequeue {
+    my ($payload) = @_;
+    # clone the payload so we can modify it without impacting TheSchwartz's
+    # ability to process the job when we've finished
+    my $vars = dclone($payload);
+    # inflate objects
+    $vars->{bug}          = Bugzilla::Bug->new_from_hash($vars->{bug});
+    $vars->{to_user}      = Bugzilla::User->new_from_hash($vars->{to_user});
+    $vars->{changer}      = Bugzilla::User->new_from_hash($vars->{changer});
+    $vars->{new_comments} = [ map { Bugzilla::Comment->new_from_hash($_) } @{ $vars->{new_comments} } ];
+    foreach my $diff (@{ $vars->{diffs} }) {
+        $diff->{who} = Bugzilla::User->new_from_hash($diff->{who});
+    }
+    # generate bugmail and send
+    MessageToMTA(_generate_bugmail($vars), 1);
+}
+
+sub _flatten_object {
+    my ($object) = @_;
+    # nothing to do if it's already flattened
+    return $object unless blessed($object);
+    # the same objects are used for each recipient, so cache the flattened hash
+    my $cache = Bugzilla->request_cache->{bugmail_flat_objects} ||= {};
+    my $key = blessed($object) . '-' . $object->id;
+    return $cache->{$key} ||= $object->flatten_to_hash;
+}
+
 sub _generate_bugmail {
-    my ($user, $vars) = @_;
+    my ($vars) = @_;
+    my $user = $vars->{to_user};
     my $template = Bugzilla->template_inner($user->setting('lang'));
     my ($msg_text, $msg_html, $msg_header);
-  
+
     $template->process("email/bugmail-header.txt.tmpl", $vars, \$msg_header)
         || ThrowTemplateError($template->error());
     $template->process("email/bugmail.txt.tmpl", $vars, \$msg_text)
@@ -507,6 +553,27 @@ sub _get_new_bugmail_fields {
 
 1;
 
+=head1 NAME
+
+BugMail - Routines to generate email notifications when a bug is created or
+modified.
+
+=head1 METHODS
+
+=over 4
+
+=item C<enqueue>
+
+Serialises the variables required to generate bugmail and pushes the result to
+the job-queue for processing by TheSchwartz.
+
+=item C<dequeue>
+
+When given serialised variables from the job-queue, recreates the objects from
+the flattened hashes, generates the bugmail, and sends it.
+
+=back
+
 =head1 B<Methods in need of POD>
 
 =over
diff --git a/Bugzilla/Job/BugMail.pm b/Bugzilla/Job/BugMail.pm
new file mode 100644
index 000000000..9c176b005
--- /dev/null
+++ b/Bugzilla/Job/BugMail.pm
@@ -0,0 +1,31 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::Job::BugMail;
+
+use 5.10.1;
+use strict;
+
+use Bugzilla::BugMail;
+BEGIN { eval "use parent qw(Bugzilla::Job::Mailer)"; }
+
+sub work {
+    my ($class, $job) = @_;
+    my $success = eval {
+        Bugzilla::BugMail::dequeue($job->arg->{vars});
+        1;
+    };
+    if (!$success) {
+        $job->failed($@);
+        undef $@;
+    }
+    else {
+        $job->completed;
+    }
+}
+
+1;
diff --git a/Bugzilla/Job/Mailer.pm b/Bugzilla/Job/Mailer.pm
index 3d52f8428..8fce80dd0 100644
--- a/Bugzilla/Job/Mailer.pm
+++ b/Bugzilla/Job/Mailer.pm
@@ -43,13 +43,3 @@ sub work {
 }
 
 1;
-
-=head1 B<Methods in need of POD>
-
-=over
-
-=item retry_delay
-
-=item work
-
-=back
diff --git a/Bugzilla/JobQueue.pm b/Bugzilla/JobQueue.pm
index 9365a7d56..d67066322 100644
--- a/Bugzilla/JobQueue.pm
+++ b/Bugzilla/JobQueue.pm
@@ -22,6 +22,7 @@ use fields qw(_worker_pidfile);
 # If you add new types of jobs, you should add a mapping here.
 use constant JOB_MAP => {
     send_mail => 'Bugzilla::Job::Mailer',
+    bug_mail  => 'Bugzilla::Job::BugMail',
 };
 
 # Without a driver cache TheSchwartz opens a new database connection
diff --git a/Bugzilla/Object.pm b/Bugzilla/Object.pm
index 0cecb8eca..9f305e929 100644
--- a/Bugzilla/Object.pm
+++ b/Bugzilla/Object.pm
@@ -113,7 +113,10 @@ sub _init {
             "SELECT $columns FROM $table WHERE $condition", undef, @values);
     }
 
-    $class->_cache_set($param, $object) if $object;
+    if ($object) {
+        $class->_serialisation_keys($object);
+        $class->_cache_set($param, $object);
+    }
     return $object;
 }
 
@@ -144,6 +147,15 @@ sub cache_key {
     }
 }
 
+# To support serialisation, we need to capture the keys in an object's default
+# hashref.
+sub _serialisation_keys {
+    my ($class, $object) = @_;
+    my $cache = Bugzilla->request_cache->{serialisation_keys} ||= {};
+    $cache->{$class} = [ keys %$object ] if $object;
+    return @{ $cache->{$class} };
+}
+
 sub check {
     my ($invocant, $param) = @_;
     my $class = ref($invocant) || $invocant;
@@ -199,6 +211,14 @@ sub new_from_list {
     return match($invocant, { $id_field => \@detainted_ids });
 }
 
+sub new_from_hash {
+    my $invocant = shift;
+    my $class = ref($invocant) || $invocant;
+    my $object = shift;
+    bless($object, $class);
+    return $object;
+}
+
 # Note: Future extensions to this could be:
 #  * Add a MATCH_JOIN constant so that we can join against
 #    certain other tables for the WHERE criteria.
@@ -297,7 +317,8 @@ sub _do_list_select {
     my @untainted = @{ $values || [] };
     trick_taint($_) foreach @untainted;
     my $objects = $dbh->selectall_arrayref($sql, {Slice=>{}}, @untainted);
-    bless ($_, $class) foreach @$objects;
+    $class->_serialisation_keys($objects->[0]) if @$objects;
+    bless($_, $class) foreach @$objects;
     return $objects
 }
 
@@ -474,6 +495,13 @@ sub audit_log {
     }
 }
 
+sub flatten_to_hash {
+    my $self = shift;
+    my $class = blessed($self);
+    my %hash = map { $_ => $self->{$_} } $class->_serialisation_keys;
+    return \%hash;
+}
+
 ###############################
 ####      Subroutines    ######
 ###############################
@@ -1040,6 +1068,13 @@ template.
 
  Returns:     A reference to an array of objects.
 
+=item C<new_from_hash($hashref)>
+
+  Description: Create an object from the given hash.
+
+  Params:      $hashref - A reference to a hash which was created by
+                          flatten_to_hash.
+
 =item C<match>
 
 =over
@@ -1277,6 +1312,17 @@ that should be passed to the C<set_> function that is called.
 
 =back
 
+=head2 Simple Methods
+
+=over
+
+=item C<flatten_to_hash>
+
+Returns a hashref suitable for serialisation and re-inflation with C<new_from_hash>.
+
+=back
+
+
 =head2 Simple Validators
 
 You can use these in your subclass L</VALIDATORS> or L</UPDATE_VALIDATORS>.
diff --git a/t/011pod.t b/t/011pod.t
index 0ddd3059d..d4e0fb780 100644
--- a/t/011pod.t
+++ b/t/011pod.t
@@ -43,6 +43,7 @@ use constant MODULE_WHITELIST => qw(
     Bugzilla::Auth::Verify::
     Bugzilla::BugUrl::
     Bugzilla::Config::
+    Bugzilla::Job::
 );
 
 # Capture the TESTOUT from Test::More or Test::Builder for printing errors.

From ab419ec22977fec5ee358185817e5ae05987901e Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 31 Jul 2013 21:44:37 +0800
Subject: [PATCH 151/240] Bug 896330: patchreader should not set the "expires"
 header r=sgreen, a=sgreen

---
 Bugzilla/Attachment/PatchReader.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Bugzilla/Attachment/PatchReader.pm b/Bugzilla/Attachment/PatchReader.pm
index 7bbbfacae..b29240c5b 100644
--- a/Bugzilla/Attachment/PatchReader.pm
+++ b/Bugzilla/Attachment/PatchReader.pm
@@ -296,8 +296,7 @@ sub setup_template_patch_reader {
                             && Bugzilla->params->{'cvsroot_get'} && !$vars->{'newid'};
 
     # Print everything out.
-    print $cgi->header(-type => 'text/html',
-                       -expires => '+3M');
+    print $cgi->header(-type => 'text/html');
 
     $last_reader->sends_data_to(new PatchReader::DiffPrinter::template($template,
                                 "attachment/diff-header.$format.tmpl",

From fbb168ed7288775e6932a010cd3973d08f4e9146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 1 Aug 2013 03:19:44 +0200
Subject: [PATCH 152/240] Bug 781672: checksetup.pl fails to check the version
 of the latest Apache2::SizeLimit release (it throws "Invalid version format
 (non-numeric data)") r=dkl a=sgreen

---
 Bugzilla/Install/Requirements.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index b6e3f9033..0d02904e9 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -676,8 +676,15 @@ sub have_vers {
     Bugzilla::Install::Util::set_output_encoding();
 
     # VERSION is provided by UNIVERSAL::, and can be called even if
-    # the module isn't loaded.
-    my $vnum = $module->VERSION || -1;
+    # the module isn't loaded. We eval'uate ->VERSION because it can die
+    # when the version is not valid (yes, this happens from time to time).
+    # In that case, we use an uglier method to get the version.
+    my $vnum = eval { $module->VERSION };
+    if ($@) {
+        no strict 'refs';
+        $vnum = ${"${module}::VERSION"};
+    }
+    $vnum ||= -1;
 
     # Fix CPAN versions like 1.9304.
     if ($module eq 'CPAN' and $vnum =~ /^(\d\.\d{2})\d{2}$/) {

From 963e9394e78ca5bac5aa083517479eff281e1483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 1 Aug 2013 03:23:54 +0200
Subject: [PATCH 153/240] Bug 834290: Add support for iPads and iPhones in
 useragent strings r=dkl a=sgreen

---
 Bugzilla/UserAgent.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Bugzilla/UserAgent.pm b/Bugzilla/UserAgent.pm
index c3f38cf85..3c334d08d 100644
--- a/Bugzilla/UserAgent.pm
+++ b/Bugzilla/UserAgent.pm
@@ -49,6 +49,7 @@ use constant PLATFORMS_MAP => (
     # HP
     qr/\(.*9000.*\)/ => ["PA-RISC", "HP"],
     # ARM
+    qr/\(.*(?:iPad|iPhone).*\)/ => ["ARM"],
     qr/\(.*ARM.*\)/ => ["ARM", "PocketPC"],
     # PocketPC intentionally before PowerPC
     qr/\(.*Windows CE.*PPC.*\)/ => ["ARM", "PocketPC"],
@@ -119,6 +120,12 @@ use constant OS_MAP => (
     qr/\(.*Win(?:dows[ -]|)NT.*\)/ => ["Windows NT"],
     qr/\(.*Windows.*NT.*\)/ => ["Windows NT"],
     # OS X
+    qr/\(.*(?:iPad|iPhone).*OS 7.*\)/ => ["iOS 7"],
+    qr/\(.*(?:iPad|iPhone).*OS 6.*\)/ => ["iOS 6"],
+    qr/\(.*(?:iPad|iPhone).*OS 5.*\)/ => ["iOS 5"],
+    qr/\(.*(?:iPad|iPhone).*OS 4.*\)/ => ["iOS 4"],
+    qr/\(.*(?:iPad|iPhone).*OS 3.*\)/ => ["iOS 3"],
+    qr/\(.*(?:iPad|iPhone).*\)/ => ["iOS"],
     qr/\(.*Mac OS X (?:|Mach-O |\()10.8.*\)/ => ["Mac OS X 10.8"],
     qr/\(.*Mac OS X (?:|Mach-O |\()10.7.*\)/ => ["Mac OS X 10.7"],
     qr/\(.*Mac OS X (?:|Mach-O |\()10.6.*\)/ => ["Mac OS X 10.6"],

From df0d72cd0bfebdb6297c4c80112a38662828dae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sat, 3 Aug 2013 18:18:17 +0200
Subject: [PATCH 154/240] Fix wrong links in REST POD

---
 Bugzilla/WebService/Server/REST/Resources/Classification.pm | 2 +-
 Bugzilla/WebService/Server/REST/Resources/Product.pm        | 2 +-
 Bugzilla/WebService/Server/REST/Resources/User.pm           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/WebService/Server/REST/Resources/Classification.pm b/Bugzilla/WebService/Server/REST/Resources/Classification.pm
index 5bb697ac1..2bbc05c72 100644
--- a/Bugzilla/WebService/Server/REST/Resources/Classification.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/Classification.pm
@@ -45,5 +45,5 @@ Bugzilla::Webservice::Server::REST::Resources::Classification - The Classificati
 This part of the Bugzilla REST API allows you to deal with the available Classifications.
 You will be able to get information about them as well as manipulate them.
 
-See L<Bugzilla::WebService::Bug> for more details on how to use this part
+See L<Bugzilla::WebService::Classification> for more details on how to use this part
 of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Product.pm b/Bugzilla/WebService/Server/REST/Resources/Product.pm
index acee3887b..fef7c6174 100644
--- a/Bugzilla/WebService/Server/REST/Resources/Product.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/Product.pm
@@ -78,5 +78,5 @@ Bugzilla::Webservice::Server::REST::Resources::Product - The Product REST API
 This part of the Bugzilla REST API allows you to list the available Products and
 get information about them.
 
-See L<Bugzilla::WebService::Bug> for more details on how to use this part of
+See L<Bugzilla::WebService::Product> for more details on how to use this part of
 the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/User.pm b/Bugzilla/WebService/Server/REST/Resources/User.pm
index 9424b517e..1f82f752d 100644
--- a/Bugzilla/WebService/Server/REST/Resources/User.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/User.pm
@@ -61,5 +61,5 @@ Bugzilla::Webservice::Server::REST::Resources::User - The User Account REST API
 This part of the Bugzilla REST API allows you to get User information as well
 as create User Accounts.
 
-See L<Bugzilla::WebService::Bug> for more details on how to use this part of
+See L<Bugzilla::WebService::User> for more details on how to use this part of
 the REST API.

From 04f2141e75a729f92aa1cc3f1ae49026fd67afc4 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 6 Aug 2013 11:35:33 +1000
Subject: [PATCH 155/240] Bug 467510 - Remove 'bug' from all page titles
 containing bug number r=sgreen, a=sgreen

---
 template/en/default/bug/process/header.html.tmpl | 2 +-
 template/en/default/bug/show-header.html.tmpl    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index f7f61a737..55de0c324 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -17,7 +17,7 @@
 [% IF    title_tag == "bug_processed" %]
   [% title = BLOCK %]
     [% IF Bugzilla.cgi.param('id') %]
-      [% terms.Bug %] [%+ id FILTER html %]
+      [%+ id FILTER html %]
     [% ELSE %]
       [% terms.Bugs %]
     [% END %]
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index f67bbf2f8..1aba5c35a 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -18,7 +18,7 @@
 [% filtered_timestamp = bug.delta_ts FILTER time %]
 
 [% subheader = filtered_desc %]
-[% title = "$terms.Bug $bug.bug_id &ndash; " %]
+[% title = "$bug.bug_id &ndash; " %]
 [% IF bug.alias != '' %]
   [% title = title _ "($filtered_alias) " %]
 [% END %]
@@ -28,7 +28,7 @@
 [% IF bug.defined %]
   [% header = "$terms.Bug&nbsp;$bug.bug_id" %]
   [% header_addl_info = "Last modified: $filtered_timestamp" %]
-  [% unfiltered_title = "$terms.Bug $bug.bug_id – " %]
+  [% unfiltered_title = "$bug.bug_id – " %]
   [% IF bug.alias != '' %]
     [% unfiltered_title = unfiltered_title _ "($bug.alias) " %]
   [% END %]

From 3857c9c6518faadcc7cd350a287a78da6da6a509 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 6 Aug 2013 11:43:27 +1000
Subject: [PATCH 156/240] Bug 491316 - Allow the reporter to enter keywords at
 bug creation r=sgreen, a=sgreen

---
 Bugzilla/Bug.pm                               |  8 +-------
 .../en/default/bug/create/create.html.tmpl    | 20 +++++++++----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index f27baa532..842dacff4 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -1713,13 +1713,7 @@ sub _check_keywords {
         $keywords_in = trim($keywords_in);
         $keyword_array = [split(/[\s,]+/, $keywords_in)];
     }
-    
-    # On creation, only editbugs users can set keywords.
-    if (!ref $invocant) {
-        my $product = $params->{product};
-        return [] if !Bugzilla->user->in_group('editbugs', $product->id);
-    }
-    
+ 
     my %keywords;
     foreach my $keyword (@$keyword_array) {
         next unless $keyword;
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index a2109c956..9c7775f07 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -595,17 +595,17 @@ TUI_hide_default('attachment_text_field');
 </tbody>
 
 <tbody class="expert_fields">
+  [% IF use_keywords %]
+    <tr>
+      [% INCLUDE bug/field.html.tmpl
+        bug = default, field = bug_fields.keywords, editable = 1,
+        value = keywords, possible_values = all_keywords,
+        desc_url = "describekeywords.cgi", value_span = 2
+      %]
+    </tr>
+  [% END %]
+  
   [% IF user.in_group('editbugs', product.id) %]
-    [% IF use_keywords %]
-      <tr>
-        [% INCLUDE bug/field.html.tmpl
-           bug = default, field = bug_fields.keywords, editable = 1,
-           value = keywords, possible_values = all_keywords,
-           desc_url = "describekeywords.cgi", value_span = 2
-        %]
-      </tr>
-    [% END %]
-
     <tr>
       [% INCLUDE "bug/field-label.html.tmpl"
         field = bug_fields.dependson editable = 1

From f77e7e59b70dfdf0968cbee3ddd796221812a992 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 6 Aug 2013 11:47:08 +1000
Subject: [PATCH 157/240] Bug 898784 - Clarify on the CreateAccount page that
 email address is login when param emailsuffix is set. r=sgreen, a=sgreen

---
 template/en/default/account/create.html.tmpl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index bf2cf31f0..448520b5d 100644
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -59,7 +59,13 @@
   <table>
     <tr>
       <td align="right">
-        <b>Email address:</b>
+        <b>
+          [% IF Param('emailsuffix') %]
+            Login:
+          [% ELSE %]
+            Email address:
+          [% END %]
+        </b>
       </td>
       <td>
         <input size="35" id="login" name="login">

From 21e344a2c2be1ff5538b648ee8c918129ce321d4 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 6 Aug 2013 11:50:16 +1000
Subject: [PATCH 158/240] Bug 899679 - Bug History page, "back to" should not
 be striked of only Bug # should be striked off. r=sgreen, a=sgreen

---
 template/en/default/account/auth/login.html.tmpl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 33440b82f..14415f1a6 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -29,7 +29,15 @@
 [%- IF Bugzilla.cgi.param("data") %] enctype="multipart/form-data"[% END %]>
   <table>
     <tr>
-      <th><label for="Bugzilla_login">Login:</label></th>
+      <th>
+        <label for="Bugzilla_login">
+          [% IF Param('emailsuffix') %]
+            Login:
+          [% ELSE %]
+            Your Email Address:
+          [% END %]
+        </label>
+      </th>
       <td>
         <input size="35" id="Bugzilla_login" name="Bugzilla_login">
         [% Param('emailsuffix') FILTER html %]

From 410b1f542e940ac5e943736c2e2e47976ba79b65 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 6 Aug 2013 12:06:09 +1000
Subject: [PATCH 159/240] Bug 899679 - Bug History page, "back to" should not
 be striked of only Bug # should be striked off. r=sgreen, a=sgreen

---
 template/en/default/bug/activity/show.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/en/default/bug/activity/show.html.tmpl b/template/en/default/bug/activity/show.html.tmpl
index a442abd4b..0d4f06323 100644
--- a/template/en/default/bug/activity/show.html.tmpl
+++ b/template/en/default/bug/activity/show.html.tmpl
@@ -21,14 +21,14 @@
  %]
 
 <p>
-  [% "Back to $terms.bug $bug.bug_id" FILTER bug_link(bug) FILTER none %]
+  Back to [% "$terms.bug $bug.bug_id" FILTER bug_link(bug) FILTER none %]
 </p>
 
 [% PROCESS bug/activity/table.html.tmpl %]
 
 [% IF operations.size > 0 %]
   <p>
-    [% "Back to $terms.bug $bug.bug_id" FILTER bug_link(bug) FILTER none %]
+    Back to [% "$terms.bug $bug.bug_id" FILTER bug_link(bug) FILTER none %]
   </p>
 [% END %]
 

From a051a19b0190b743fb5f16f1983ea35052d5072c Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Wed, 7 Aug 2013 15:16:46 +1000
Subject: [PATCH 160/240] Bug 897264 - letters_numbers_specialchars password
 restriction is incorrect r=LpSolit, a=sgreen

---
 Bugzilla/User.pm                              |  2 +-
 .../en/default/global/user-error.html.tmpl    | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 943ec7247..c6cd23840 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -2116,7 +2116,7 @@ sub validate_password {
     my $complexity_level = Bugzilla->params->{password_complexity};
     if ($complexity_level eq 'letters_numbers_specialchars') {
         ThrowUserError('password_not_complex')
-          if ($password !~ /\w/ || $password !~ /\d/ || $password !~ /[[:punct:]]/);
+          if ($password !~ /[[:alpha:]]/ || $password !~ /\d/ || $password !~ /[[:punct:]]/);
     } elsif ($complexity_level eq 'letters_numbers') {
         ThrowUserError('password_not_complex')
           if ($password !~ /[[:lower:]]/ || $password !~ /[[:upper:]]/ || $password !~ /\d/);
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 65fb4f18a..038704c34 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1395,21 +1395,21 @@
     [%+ constants.USER_PASSWORD_MIN_LENGTH FILTER html %] characters long.
 
   [% ELSIF error == "password_not_complex" %]
-     [% title = "Password Fails Requirements" %]
-     [% passregex = Param('password_complexity') %]
-     The password must contain at least one:
-     <ul>
-       [% IF passregex.search('letters') %]
-         <li>UPPERCASE letter</li>
-         <li>lowercase letter</li>
-       [% END %]
-       [% IF passregex.search('numbers') %]
-         <li>digit</li>
-       [% END %]
-       [% IF passregex.search('specialchars') %]
-         <li>special character</li>
-       [% END %]
-     </ul>
+    [% title = "Password Fails Requirements" %]
+    [% passregex = Param('password_complexity') %]
+    The password must contain at least one:
+    <ul>
+      [% IF passregex == 'letters_numbers_specialchars' %]
+        <li>letter</li>
+        <li>special character</li>
+      [% ELSIF passregex.search('letters') %]
+        <li>UPPERCASE letter</li>
+        <li>lowercase letter</li>
+      [% END %]
+      [% IF passregex.search('numbers') %]
+        <li>digit</li>
+      [% END %]
+    </ul>
 
   [% ELSIF error == "product_access_denied" %]
     [% title = "Product Access Denied" %]

From c750c6017355b5c508dececbd4d2ebc444993686 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 7 Aug 2013 15:21:12 +1000
Subject: [PATCH 161/240] Bug 868330 - Password creation directions incomplete
 r=sgreen, a=sgreen

---
 .../password/set-forgotten-password.html.tmpl     | 15 ++++++++++++---
 template/en/default/admin/params/auth.html.tmpl   |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/template/en/default/account/password/set-forgotten-password.html.tmpl b/template/en/default/account/password/set-forgotten-password.html.tmpl
index 55b97addc..b203e66e9 100644
--- a/template/en/default/account/password/set-forgotten-password.html.tmpl
+++ b/template/en/default/account/password/set-forgotten-password.html.tmpl
@@ -8,10 +8,20 @@
 
 [% title = "Change Password" %]
 [% PROCESS global/header.html.tmpl %]
-
+[% password_complexity = Param('password_complexity') %]
 <p>
-  To change your password, enter a new password twice:
+  To change your password, enter a new password twice:<br>
 </p>
+<ul>
+  <li>Password must be at least [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters long.</li>
+  [% IF password_complexity == "mixed_letters" %] 
+  <li>Password must contain at least one UPPER and one lowercase letter.</li>
+  [% ELSIF password_complexity == "letters_numbers" %] 
+  <li>Password must contain at least one UPPER and one lower case letter and a number.</li>
+  [% ELSIF password_complexity == "letters_numbers_specialchars" %] 
+  <li>Password must contain at least one letter, a number and a special character.</li>
+  [% END %]
+</ul>
 
 <form method="post" action="token.cgi">
   <input type="hidden" name="t" value="[% token FILTER html %]">
@@ -21,7 +31,6 @@
       <th>New password:</th>
       <td>
         <input type="password" name="password">
-        (minimum [% constants.USER_PASSWORD_MIN_LENGTH FILTER none %] characters)
       </td>
     </tr>
     
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index 57db6025a..41acc1a7f 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -132,6 +132,6 @@
     "<li>letters_numbers - Passwords must contain at least one UPPER and one " _
     "lower case letter and a number.</li>" _
     "<li>letters_numbers_specialchars - Passwords must contain at least one " _
-    "UPPER or one lower case letter, a number and a special character.</li></ul>"
+    "letter, a number and a special character.</li></ul>"
   }
 %]

From 5a7ddacec0ce8ed26515dcd559712b8f29c921e2 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 7 Aug 2013 15:24:59 +1000
Subject: [PATCH 162/240] Bug 817306 - Add additional words to test for
 reserved SQL words in schema r=sgreen, a=glob

---
 t/013dbschema.t | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/013dbschema.t b/t/013dbschema.t
index 47422b0b4..c1f9c7f0c 100644
--- a/t/013dbschema.t
+++ b/t/013dbschema.t
@@ -20,9 +20,9 @@ use Bugzilla::DB::Schema;
 
 # SQL reserved words
 use constant RESERVED_WORDS => qw(
-    ABSOLUTE ACTION ACTOR ADD AFTER ALL ALLOCATE ALTER ANY AND ARE ASC ASSERTION ASYNC AT
-    ATTRIBUTES BEFORE BEGIN BETWEEN BIT BIT_LENGTH BOOLEAN BOTH BREADTH CALL CASCADE
-    CASCADED CASE CAST CATALOG CHARACTER_LENGTH CHAR_LENGTH COLLATE
+    ABSOLUTE ACTION ACTOR ADD AFTER ALL ALLOCATE ALTER ANY AND ARE AS ASC ASSERTION ASYNC AT
+    ATTRIBUTES BEFORE BEGIN BETWEEN BIT BIT_LENGTH BOOLEAN BOTH BREADTH BY CALL CASCADE
+    CASCADED CASE CAST CATALOG CHAR CHARACTER_LENGTH CHAR_LENGTH COLLATE
     COLLATION COLUMN COMPLETION CONNECT CONNECTION CONSTRAINT CONSTRAINTS
     CONVERT CORRESPONDING CREATE CROSS CURRENT_DATE CURRENT_PATH CURRENT_TIME
     CURRENT_TIMESTAMP CURRENT_USER CYCLE DATA DATE DAY DEALLOCATE DECLARE DEFAULT DEFERRABLE
@@ -42,7 +42,7 @@ use constant RESERVED_WORDS => qw(
     SQLWARNING START STATE STRUCTURE SUBSTRING SYMBOL SYSTEM_USER TABLE TEMPORARY
     TERM TEST THEN THERE TIME TIMESTAMP TIMEZONE_HOUR TIMEZONE_MINUTE TRAILING
     TRANSACTION TRANSLATE TRANSLATION TRIGGER TRIM TRUE TUPLE UNDER
-    UNKNOWN UNION UNIQUE UPDATE UPPER USAGE USING VARCHAR VARIABLE VARYING VIRTUAL VISIBLE
+    UNKNOWN UNION UNIQUE UPDATE UPPER USAGE USING VARCHAR VARIABLE VARYING VIEW VIRTUAL VISIBLE
     WAIT WHEN WHERE WHILE WITH WITHOUT WRITE YEAR ZONE
 );
 

From 48dd625aa68f14860c143608852bbdf427b5e754 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 7 Aug 2013 15:28:52 +1000
Subject: [PATCH 163/240] Bug 901620 - Grammar error in the documentation
 r=sgreen, a=glob

---
 docs/en/xml/administration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml
index d0525d917..d803beb10 100644
--- a/docs/en/xml/administration.xml
+++ b/docs/en/xml/administration.xml
@@ -1065,7 +1065,7 @@
             <para>
             <emphasis>Login Name</emphasis>: 
             This is generally the user's full email address. However, if you
-            have are using the <quote>emailsuffix</quote> parameter, this may
+            are using the <quote>emailsuffix</quote> parameter, this may
             just be the user's login name. Note that users can now change their
             login names themselves (to any valid email address).
             </para>

From aea890981e337581dce3972f0c5f9c7301d86071 Mon Sep 17 00:00:00 2001
From: rajanu <aliustek@gmail.com>
Date: Thu, 8 Aug 2013 13:03:10 -0400
Subject: [PATCH 164/240] Bug 875732 - Need hooks for new column in
 saved-searches r=dkl,a=glob

---
 template/en/default/account/prefs/saved-searches.html.tmpl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/template/en/default/account/prefs/saved-searches.html.tmpl b/template/en/default/account/prefs/saved-searches.html.tmpl
index 5f5f09e04..ddc2a945b 100644
--- a/template/en/default/account/prefs/saved-searches.html.tmpl
+++ b/template/en/default/account/prefs/saved-searches.html.tmpl
@@ -55,6 +55,7 @@
           Share With a Group
         </th>
       [% END %]
+      [% Hook.process('saved-header') %]
     </tr>
     <tr>
       <td>My [% terms.Bugs %]</td>
@@ -79,6 +80,7 @@
           &mdash;
         </td>
       [% END %]
+      [% Hook.process('saved-row') %]
     </tr>
     [% FOREACH q = user.queries %]
       <tr>
@@ -133,6 +135,7 @@
             [% END %]
           </td>
         [% END %]
+        [% Hook.process('saved-row') %]
       </tr>
     [% END %]
   </table>

From b54b0d4eef1703ccf45add5367103d02e479b7c8 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 8 Aug 2013 13:10:19 -0400
Subject: [PATCH 165/240] Bug 669535 - User pref for "Possible Duplicates"
 r=dkl,a=glob

---
 Bugzilla/Install.pm                                | 2 ++
 template/en/default/bug/create/create.html.tmpl    | 3 ++-
 template/en/default/global/setting-descs.none.tmpl | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index 258adf811..41f88d70b 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -87,6 +87,8 @@ sub SETTINGS {
     requestee_cc       => { options => ['on', 'off'], default => 'on' },
     # 2012-04-30 glob@mozilla.com -- Bug 663747
     bugmail_new_prefix => { options => ['on', 'off'], default => 'on' },
+    # 2013-07-26 joshi_sunil@in.com -- Bug 669535
+    possible_duplicates => { options => ['on', 'off'], default => 'on' },
     }
 };
 
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 9c7775f07..66c5dfff9 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -491,7 +491,8 @@ TUI_hide_default('attachment_text_field');
     </td>
   </tr>
 
-  [% IF feature_enabled('jsonrpc') AND !cloned_bug_id %]
+  [% IF feature_enabled('jsonrpc') AND !cloned_bug_id
+     	 AND user.settings.possible_duplicates.value == 'on' %]
     <tr id="possible_duplicates_container" class="bz_default_hidden">
       <th>Possible<br>Duplicates:</th>
       <td colspan="3">
diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl
index d20068306..6e3358782 100644
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -43,6 +43,7 @@
    "text_only"                        => "Text Only",
    "requestee_cc"                     => "Automatically add me to the CC list of $terms.bugs I am requested to review",
    "bugmail_new_prefix"               => "Add 'New:' to subject line of email sent when a new $terms.bug is filed",
+   "possible_duplicates"              => "Display possible duplicates when reporting a new $terms.bug", 
                    } 
 %]
 

From ca7cce21d1c90d9584bc077260eba7d98b679ad7 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Thu, 8 Aug 2013 13:20:03 -0400
Subject: [PATCH 166/240] Bug 669535 - User pref for "Possible Duplicates" -
 Failed test 'template/en/default/bug/create/create.html.tmpl contains tabs
 --WARNING'

---
 template/en/default/bug/create/create.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 66c5dfff9..797947e6c 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -492,7 +492,7 @@ TUI_hide_default('attachment_text_field');
   </tr>
 
   [% IF feature_enabled('jsonrpc') AND !cloned_bug_id
-     	 AND user.settings.possible_duplicates.value == 'on' %]
+        AND user.settings.possible_duplicates.value == 'on' %]
     <tr id="possible_duplicates_container" class="bz_default_hidden">
       <th>Possible<br>Duplicates:</th>
       <td colspan="3">

From 294bb1331bf10443a4ebb88bddf98eddd9f09233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 8 Aug 2013 21:56:03 +0200
Subject: [PATCH 167/240] Bug 899586: Consecutive whitespaces in field values
 are ignored in <select> elements r=sgreen a=glob

---
 template/en/default/search/field.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index dc1592e38..86f293aa1 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -105,7 +105,7 @@
         [% FOREACH current_value = legal_values %]
           [% SET v = current_value.name OR '---' -%]
           [% SET display = display_value(field.name, current_value.name) %]
-          <option [% IF v != display %]value="[% v FILTER html %]"[% END ~%]
+          <option value="[% v FILTER html %]"
             id="v[% current_value.id FILTER html %]_[% field.name FILTER html %]"
             [% ' selected="selected"' IF value.contains( v ) %]>
             [%~ display FILTER html ~%]

From 2071657f20a86306749899e740577be41451c104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Fri, 9 Aug 2013 11:13:45 +0200
Subject: [PATCH 168/240] Bug 898830: Improve loading time of show_bug.cgi
 r=sgreen a=justdave

---
 Bugzilla/Attachment.pm | 62 ++++++++++++++++++------------------------
 Bugzilla/User.pm       |  3 +-
 Bugzilla/Util.pm       |  7 +++--
 3 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index df1a11fcc..7e758c874 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -126,8 +126,7 @@ the ID of the bug to which the attachment is attached
 =cut
 
 sub bug_id {
-    my $self = shift;
-    return $self->{bug_id};
+    return $_[0]->{bug_id};
 }
 
 =over
@@ -141,11 +140,8 @@ the bug object to which the attachment is attached
 =cut
 
 sub bug {
-    my $self = shift;
-
     require Bugzilla::Bug;
-    $self->{bug} ||= Bugzilla::Bug->new({ id => $self->bug_id, cache => 1 });
-    return $self->{bug};
+    return $_[0]->{bug} //= Bugzilla::Bug->new({ id => $_[0]->bug_id, cache => 1 });
 }
 
 =over
@@ -159,8 +155,7 @@ user-provided text describing the attachment
 =cut
 
 sub description {
-    my $self = shift;
-    return $self->{description};
+    return $_[0]->{description};
 }
 
 =over
@@ -174,8 +169,7 @@ the attachment's MIME media type
 =cut
 
 sub contenttype {
-    my $self = shift;
-    return $self->{mimetype};
+    return $_[0]->{mimetype};
 }
 
 =over
@@ -189,9 +183,8 @@ the user who attached the attachment
 =cut
 
 sub attacher {
-    my $self = shift;
-    return $self->{attacher}
-      ||= new Bugzilla::User({ id => $self->{submitter_id}, cache => 1 });
+    return $_[0]->{attacher}
+      //= new Bugzilla::User({ id => $_[0]->{submitter_id}, cache => 1 });
 }
 
 =over
@@ -205,8 +198,7 @@ the date and time on which the attacher attached the attachment
 =cut
 
 sub attached {
-    my $self = shift;
-    return $self->{creation_ts};
+    return $_[0]->{creation_ts};
 }
 
 =over
@@ -220,8 +212,7 @@ the date and time on which the attachment was last modified.
 =cut
 
 sub modification_time {
-    my $self = shift;
-    return $self->{modification_time};
+    return $_[0]->{modification_time};
 }
 
 =over
@@ -235,8 +226,7 @@ the name of the file the attacher attached
 =cut
 
 sub filename {
-    my $self = shift;
-    return $self->{filename};
+    return $_[0]->{filename};
 }
 
 =over
@@ -250,8 +240,7 @@ whether or not the attachment is a patch
 =cut
 
 sub ispatch {
-    my $self = shift;
-    return $self->{ispatch};
+    return $_[0]->{ispatch};
 }
 
 =over
@@ -265,8 +254,7 @@ whether or not the attachment is obsolete
 =cut
 
 sub isobsolete {
-    my $self = shift;
-    return $self->{isobsolete};
+    return $_[0]->{isobsolete};
 }
 
 =over
@@ -280,8 +268,7 @@ whether or not the attachment is private
 =cut
 
 sub isprivate {
-    my $self = shift;
-    return $self->{isprivate};
+    return $_[0]->{isprivate};
 }
 
 =over
@@ -298,8 +285,7 @@ matches, because this will return a value even if it's matched by the generic
 =cut
 
 sub is_viewable {
-    my $self = shift;
-    my $contenttype = $self->contenttype;
+    my $contenttype = $_[0]->contenttype;
     my $cgi = Bugzilla->cgi;
 
     # We assume we can view all text and image types.
@@ -373,7 +359,7 @@ the length (in bytes) of the attachment content
 
 sub datasize {
     my $self = shift;
-    return $self->{datasize} if exists $self->{datasize};
+    return $self->{datasize} if defined $self->{datasize};
 
     # If we have already retrieved the data, return its size.
     return length($self->{data}) if exists $self->{data};
@@ -416,11 +402,8 @@ flags that have been set on the attachment
 =cut
 
 sub flags {
-    my $self = shift;
-
     # Don't cache it as it must be in sync with ->flag_types.
-    $self->{flags} = [map { @{$_->{flags}} } @{$self->flag_types}];
-    return $self->{flags};
+    return $_[0]->{flags} = [map { @{$_->{flags}} } @{$_[0]->flag_types}];
 }
 
 =over
@@ -443,8 +426,7 @@ sub flag_types {
                  component_id => $self->bug->component_id,
                  attach_id    => $self->id };
 
-    $self->{flag_types} = Bugzilla::Flag->_flag_types($vars);
-    return $self->{flag_types};
+    return $self->{flag_types} = Bugzilla::Flag->_flag_types($vars);
 }
 
 ###############################
@@ -677,7 +659,7 @@ sub get_attachments_by_bug {
     # To avoid $attachment->flags to run SQL queries itself for each
     # attachment listed here, we collect all the data at once and
     # populate $attachment->{flags} ourselves.
-    # We also load all attachers at once for the same reason.
+    # We also load all attachers and datasizes at once for the same reason.
     if ($vars->{preload}) {
         # Preload flags.
         $_->{flags} = [] foreach @$attachments;
@@ -699,6 +681,16 @@ sub get_attachments_by_bug {
         foreach my $attachment (@$attachments) {
             $attachment->{attacher} = $user_map{$attachment->{submitter_id}};
         }
+
+        # Preload datasizes.
+        my $sizes =
+          $dbh->selectall_hashref('SELECT attach_id, LENGTH(thedata) AS size
+                                   FROM attachments LEFT JOIN attach_data ON attach_id = id
+                                   WHERE bug_id = ?',
+                                   'attach_id', undef, $bug->id);
+
+        # Force the size of attachments not in the DB to be recalculated.
+        $_->{datasize} = $sizes->{$_->id}->{size} || undef foreach @$attachments;
     }
     return $attachments;
 }
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index c6cd23840..84487dbbe 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -825,8 +825,7 @@ sub in_group_id {
 sub groups_with_icon {
     my $self = shift;
 
-    my @groups = grep { $_->icon_url } @{ $self->groups };
-    return \@groups;
+    return $self->{groups_with_icon} //= [grep { $_->icon_url } @{ $self->groups }];
 }
 
 sub get_products_by_permission {
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 58d6ab365..8c88731e3 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -71,7 +71,10 @@ sub html_quote {
     $var =~ s/"/&quot;/g;
     # Obscure '@'.
     $var =~ s/\@/\&#64;/g;
-    if (Bugzilla->params->{'utf8'}) {
+
+    state $use_utf8 = Bugzilla->params->{'utf8'};
+
+    if ($use_utf8) {
         # Remove the following characters because they're
         # influencing BiDi:
         # --------------------------------------------------------
@@ -93,7 +96,7 @@ sub html_quote {
         # |U+200e|Left-To-Right Mark        |0xe2 0x80 0x8e      |
         # |U+200f|Right-To-Left Mark        |0xe2 0x80 0x8f      |
         # --------------------------------------------------------
-        $var =~ s/[\x{202a}-\x{202e}]//g;
+        $var =~ tr/\x{202a}-\x{202e}//d;
     }
     return $var;
 }

From cc971b877e8415d8a387a315868b4e3ba697c68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Fri, 9 Aug 2013 11:16:51 +0200
Subject: [PATCH 169/240] Bug 861582: Missing description in the "Bug Fields"
 page for "Importance" r=sgreen a=justdave

---
 template/en/default/bug/field-help.none.tmpl | 4 ++++
 template/en/default/pages/fields.html.tmpl   | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/template/en/default/bug/field-help.none.tmpl b/template/en/default/bug/field-help.none.tmpl
index 238f01db0..c07ee5792 100644
--- a/template/en/default/bug/field-help.none.tmpl
+++ b/template/en/default/bug/field-help.none.tmpl
@@ -76,6 +76,10 @@ estimated_time =>
   "The amount of time that has been estimated it will take to resolve
    this ${terms.bug}.",
 
+importance =>
+  "The importance of $terms.abug is described as the combination of
+   its $vars.field_descs.priority and ${vars.field_descs.bug_severity}.",
+
 keywords =>
    "You can add keywords from a defined list to $terms.bugs, in order"
    _ " to easily identify and group them.",
diff --git a/template/en/default/pages/fields.html.tmpl b/template/en/default/pages/fields.html.tmpl
index 7412829d9..48b09aee0 100644
--- a/template/en/default/pages/fields.html.tmpl
+++ b/template/en/default/pages/fields.html.tmpl
@@ -181,6 +181,11 @@
                                     field => field } %]
 [% END %]
 
+[%# This field is not a real one, but its label is visible in bugs. %]
+
+[% field_help_map.Importance = { help  => help_html.importance,
+                                 field => "importance" } %]
+
 [%# These are fields that don't need to be documented, either because
   # they have docs somewhere else in the UI, or they don't show up on bugs. 
   # %]

From ee8971e393d35d856a3eecaf2cdc278ee74db335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Fri, 9 Aug 2013 11:26:44 +0200
Subject: [PATCH 170/240] Bug 902515: Internet Explorer 11 receives
 multipart/x-mixed-replace content from buglist.cgi r=dkl a=justdave

---
 buglist.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buglist.cgi b/buglist.cgi
index 97654cdf2..9bce1c74a 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -105,7 +105,7 @@ my $serverpush =
     && exists $ENV{'HTTP_USER_AGENT'} 
       && $ENV{'HTTP_USER_AGENT'} =~ /(Mozilla.[3-9]|Opera)/
         && $ENV{'HTTP_USER_AGENT'} !~ /compatible/i
-          && $ENV{'HTTP_USER_AGENT'} !~ /WebKit/
+          && $ENV{'HTTP_USER_AGENT'} !~ /(?:WebKit|Trident)/
             && !defined($cgi->param('serverpush'))
               || $cgi->param('serverpush');
 

From 67c1e60132b07b88ec5bd57d81e73ad27bd4446e Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 9 Aug 2013 13:10:51 -0400
Subject: [PATCH 171/240] Bug 569177 - Add support for eTag for WebServices
 r/a=glob

---
 Bugzilla/CGI.pm                       |  6 +--
 Bugzilla/WebService/Bug.pm            | 17 +++++---
 Bugzilla/WebService/Server.pm         | 60 ++++++++++++++++++++++++++-
 Bugzilla/WebService/Server/JSONRPC.pm | 29 ++++++++++---
 Bugzilla/WebService/Server/REST.pm    |  4 ++
 Bugzilla/WebService/Server/XMLRPC.pm  | 27 ++++++++++--
 config.cgi                            |  6 ++-
 7 files changed, 131 insertions(+), 18 deletions(-)

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index dacd900a0..991bfc05d 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -236,11 +236,11 @@ sub check_etag {
         $possible_etag =~ s/^\"//g;
         $possible_etag =~ s/\"$//g;
         if ($possible_etag eq $valid_etag or $possible_etag eq '*') {
-            print $self->header(-ETag => $possible_etag,
-                                -status => '304 Not Modified');
-            exit;
+            return 1;
         }
     }
+
+    return 0;
 }
 
 # Have to add the cookies in.
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index c639084ef..58405c2d0 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -349,6 +349,18 @@ sub get {
         push(@bugs, $self->_bug_to_hash($bug, $params));
     }
 
+    # Set the ETag before inserting the update tokens
+    # since the tokens will always be unique even if
+    # the data has not changed.
+    $self->bz_etag(\@bugs);
+
+    if (Bugzilla->user->id) {
+        foreach my $bug (@bugs) {
+            my $token = issue_hash_token([$bug->{'id'}, $bug->{'last_change_time'}]);
+            $bug->{'update_token'} = $self->type('string', $token);
+        }
+    }
+
     return { bugs => \@bugs, faults => \@faults };
 }
 
@@ -986,11 +998,6 @@ sub _bug_to_hash {
         }
     }
 
-    if (Bugzilla->user->id) {
-        my $token = issue_hash_token([$bug->id, $bug->delta_ts]);
-        $item{'update_token'} = $self->type('string', $token);
-    }
-
     # The "accessible" bits go here because they have long names and it
     # makes the code look nicer to separate them out.
     $item{'is_cc_accessible'} = $self->type('boolean', 
diff --git a/Bugzilla/WebService/Server.pm b/Bugzilla/WebService/Server.pm
index 02226284c..5ffd965a5 100644
--- a/Bugzilla/WebService/Server.pm
+++ b/Bugzilla/WebService/Server.pm
@@ -14,6 +14,9 @@ use Bugzilla::Error;
 use Bugzilla::Util qw(datetime_from);
 
 use Scalar::Util qw(blessed);
+use Digest::MD5 qw(md5_base64);
+
+use Storable qw(freeze);
 
 sub handle_login {
     my ($self, $class, $method, $full_method) = @_;
@@ -29,7 +32,7 @@ sub handle_login {
 
 sub datetime_format_inbound {
     my ($self, $time) = @_;
-    
+
     my $converted = datetime_from($time, Bugzilla->local_timezone);
     if (!defined $converted) {
         ThrowUserError('illegal_date', { date => $time });
@@ -55,8 +58,63 @@ sub datetime_format_outbound {
     return $time->iso8601();
 }
 
+# ETag support
+sub bz_etag {
+    my ($self, $data) = @_;
+    my $cache = Bugzilla->request_cache;
+    if (defined $data) {
+        # Serialize the data if passed a reference
+        local $Storable::canonical = 1;
+        $data = freeze($data) if ref $data;
+
+        # Wide characters cause md5_base64() to die.
+        utf8::encode($data) if utf8::is_utf8($data);
+
+        # Append content_type to the end of the data
+        # string as we want the etag to be unique to
+        # the content_type. We do not need this for
+        # XMLRPC as text/xml is always returned.
+        if (blessed($self) && $self->can('content_type')) {
+            $data .= $self->content_type if $self->content_type;
+        }
+
+        $cache->{'bz_etag'} = md5_base64($data);
+    }
+    return $cache->{'bz_etag'};
+}
+
 1;
 
+=head1 NAME
+
+Bugzilla::WebService::Server - Base server class for the WebService API
+
+=head1 DESCRIPTION
+
+Bugzilla::WebService::Server is the base class for the individual WebService API
+servers such as XMLRPC, JSONRPC, and REST. You never actually create a
+Bugzilla::WebService::Server directly, you only make subclasses of it.
+
+=head1 FUNCTIONS
+
+=over
+
+=item C<bz_etag>
+
+This function is used to store an ETag value that will be used when returning
+the data by the different API server modules such as XMLRPC, or REST. The individual
+webservice methods can also set the value earlier in the process if needed such as
+before a unique update token is added. If a value is not set earlier, an etag will
+automatically be created using the returned data except in some cases when an error
+has occurred.
+
+=back
+
+=head1 SEE ALSO
+
+L<Bugzilla::WebService::Server::XMLRPC|XMLRPC>, L<Bugzilla::WebService::Server::JSONRPC|JSONRPC>,
+and L<Bugzilla::WebService::Server::REST|REST>.
+
 =head1 B<Methods in need of POD>
 
 =over
diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm
index d4573fd19..e7b3fe7e7 100644
--- a/Bugzilla/WebService/Server/JSONRPC.pm
+++ b/Bugzilla/WebService/Server/JSONRPC.pm
@@ -75,12 +75,12 @@ sub response_header {
 
 sub response {
     my ($self, $response) = @_;
+    my $cgi = $self->cgi;
 
     # Implement JSONP.
     if (my $callback = $self->_bz_callback) {
         my $content = $response->content;
         $response->content("$callback($content)");
-
     }
 
     # Use $cgi->header properly instead of just printing text directly.
@@ -95,9 +95,18 @@ sub response {
             push(@header_args, "-$name", $value);
         }
     }
-    my $cgi = $self->cgi;
-    print $cgi->header(-status => $response->code, @header_args);
-    print $response->content;
+
+    # ETag support
+    my $etag = $self->bz_etag;
+    if ($etag && $cgi->check_etag($etag)) {
+        push(@header_args, "-ETag", $etag);
+        print $cgi->header(-status => '304 Not Modified', @header_args);
+    }
+    else {
+        push(@header_args, "-ETag", $etag) if $etag;
+        print $cgi->header(-status => $response->code, @header_args);
+        print $response->content;
+    }
 }
 
 # The JSON-RPC 1.1 GET specification is not so great--you can't specify
@@ -257,7 +266,17 @@ sub _handle {
     my $self = shift;
     my ($obj) = @_;
     $self->{_bz_request_id} = $obj->{id};
-    return $self->SUPER::_handle(@_);
+
+    my $result = $self->SUPER::_handle(@_);
+
+    # Set the ETag if not already set in the webservice methods.
+    my $etag = $self->bz_etag;
+    if (!$etag && ref $result) {
+        my $data = $self->json->decode($result)->{'result'};
+        $self->bz_etag($data);
+    }
+
+    return $result;
 }
 
 # Make all error messages returned by JSON::RPC go into the 100000
diff --git a/Bugzilla/WebService/Server/REST.pm b/Bugzilla/WebService/Server/REST.pm
index 00c71110f..8d3aa481c 100644
--- a/Bugzilla/WebService/Server/REST.pm
+++ b/Bugzilla/WebService/Server/REST.pm
@@ -125,6 +125,10 @@ sub response {
     # Access Control
     $response->header("Access-Control-Allow-Origin", "*");
 
+    # ETag support
+    my $etag = $self->bz_etag;
+    $self->bz_etag($result) if !$etag;
+
     # If accessing through web browser, then display in readable format
     if ($self->content_type eq 'text/html') {
         $result = $self->json->pretty->canonical->encode($result);
diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm
index 93c9b4cdc..40c66a8f9 100644
--- a/Bugzilla/WebService/Server/XMLRPC.pm
+++ b/Bugzilla/WebService/Server/XMLRPC.pm
@@ -21,8 +21,8 @@ if ($ENV{MOD_PERL}) {
 use Bugzilla::WebService::Constants;
 use Bugzilla::Util;
 
-# Allow WebService methods to call XMLRPC::Lite's type method directly
 BEGIN {
+    # Allow WebService methods to call XMLRPC::Lite's type method directly
     *Bugzilla::WebService::type = sub {
         my ($self, $type, $value) = @_;
         if ($type eq 'dateTime') {
@@ -39,6 +39,11 @@ BEGIN {
         }
         return XMLRPC::Data->type($type)->value($value);
     };
+
+    # Add support for ETags into XMLRPC WebServices
+    *Bugzilla::WebService::bz_etag = sub {
+        return Bugzilla::WebService::Server->bz_etag($_[1]);
+    };
 }
 
 sub initialize {
@@ -52,22 +57,38 @@ sub initialize {
 
 sub make_response {
     my $self = shift;
+    my $cgi = Bugzilla->cgi;
 
     $self->SUPER::make_response(@_);
 
     # XMLRPC::Transport::HTTP::CGI doesn't know about Bugzilla carrying around
     # its cookies in Bugzilla::CGI, so we need to copy them over.
-    foreach my $cookie (@{Bugzilla->cgi->{'Bugzilla_cookie_list'}}) {
+    foreach my $cookie (@{$cgi->{'Bugzilla_cookie_list'}}) {
         $self->response->headers->push_header('Set-Cookie', $cookie);
     }
 
     # Copy across security related headers from Bugzilla::CGI
-    foreach my $header (split(/[\r\n]+/, Bugzilla->cgi->header)) {
+    foreach my $header (split(/[\r\n]+/, $cgi->header)) {
         my ($name, $value) = $header =~ /^([^:]+): (.*)/;
         if (!$self->response->headers->header($name)) {
            $self->response->headers->header($name => $value);
         }
     }
+
+    # ETag support
+    my $etag = $self->bz_etag;
+    if (!$etag) {
+        my $data = $self->response->as_string;
+        $etag = $self->bz_etag($data);
+    }
+
+    if ($etag && $cgi->check_etag($etag)) {
+        $self->response->headers->push_header('ETag', $etag);
+        $self->response->headers->push_header('status', '304 Not Modified');
+    }
+    elsif ($etag) {
+        $self->response->headers->push_header('ETag', $etag);
+    }
 }
 
 sub handle_login {
diff --git a/config.cgi b/config.cgi
index 4c0881a11..02f954726 100755
--- a/config.cgi
+++ b/config.cgi
@@ -142,7 +142,11 @@ sub display_data {
     utf8::encode($digest_data) if utf8::is_utf8($digest_data);
     my $digest = md5_base64($digest_data);
 
-    $cgi->check_etag($digest);
+    if ($cgi->check_etag($digest)) {
+        print $cgi->header(-ETag   => $digest,
+                           -status => '304 Not Modified');
+        exit;
+    }
 
     print $cgi->header (-ETag => $digest,
                         -type => $format->{'ctype'});

From a076191d443ae5752de4a7b7f09068183c93f5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 15 Aug 2013 01:18:29 +0200
Subject: [PATCH 172/240] Bug 105865: Bugzilla should pay attention to
 linebreaks when linkifying bug IDs in comments r=dkl a=sgreen

---
 Bugzilla/Template.pm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index a8f614387..4b227e9d2 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -160,6 +160,10 @@ sub quoteUrls {
     my $chr1 = chr(1);
     $text =~ s/\0/$chr1\0/g;
 
+    # If the comment is already wrapped, we should ignore newlines when
+    # looking for matching regexps. Else we should take them into account.
+    my $s = ($comment && $comment->already_wrapped) ? qr/\s/ : qr/\h/;
+
     # However, note that adding the title (for buglinks) can affect things
     # In particular, attachment matches go before bug titles, so that titles
     # with 'attachment 1' don't double match.
@@ -226,7 +230,7 @@ sub quoteUrls {
               ~<a href=\"mailto:$2\">$1$2</a>~igx;
 
     # attachment links
-    $text =~ s~\b(attachment\s*\#?\s*(\d+)(?:\s+\[details\])?)
+    $text =~ s~\b(attachment$s*\#?$s*(\d+)(?:$s+\[details\])?)
               ~($things[$count++] = get_attachment_link($2, $1, $user)) &&
                ("\0\0" . ($count-1) . "\0\0")
               ~egmxi;
@@ -239,43 +243,43 @@ sub quoteUrls {
     # Also, we can't use $bug_re?$comment_re? because that will match the
     # empty string
     my $bug_word = template_var('terms')->{bug};
-    my $bug_re = qr/\Q$bug_word\E\s*\#?\s*(\d+)/i;
+    my $bug_re = qr/\Q$bug_word\E$s*\#?$s*(\d+)/i;
     my $comment_word = template_var('terms')->{comment};
-    my $comment_re = qr/(?:\Q$comment_word\E|comment)\s*\#?\s*(\d+)/i;
-    $text =~ s~\b($bug_re(?:\s*,?\s*$comment_re)?|$comment_re)
+    my $comment_re = qr/(?:\Q$comment_word\E|comment)$s*\#?$s*(\d+)/i;
+    $text =~ s~\b($bug_re(?:$s*,?$s*$comment_re)?|$comment_re)
               ~ # We have several choices. $1 here is the link, and $2-4 are set
                 # depending on which part matched
                (defined($2) ? get_bug_link($2, $1, { comment_num => $3, user => $user }) :
                               "<a href=\"$current_bugurl#c$4\">$1</a>")
-              ~egox;
+              ~egx;
 
     # Handle a list of bug ids: bugs 1, #2, 3, 4
     # Currently, the only delimiter supported is comma.
     # Concluding "and" and "or" are not supported.
     my $bugs_word = template_var('terms')->{bugs};
 
-    my $bugs_re = qr/\Q$bugs_word\E\s*\#?\s*
-                     \d+(?:\s*,\s*\#?\s*\d+)+/ix;
-    while ($text =~ m/($bugs_re)/go) {
+    my $bugs_re = qr/\Q$bugs_word\E$s*\#?$s*
+                     \d+(?:$s*,$s*\#?$s*\d+)+/ix;
+    while ($text =~ m/($bugs_re)/g) {
         my $offset = $-[0];
         my $length = $+[0] - $-[0];
         my $match  = $1;
 
-        $match =~ s/((?:#\s*)?(\d+))/get_bug_link($2, $1);/eg;
+        $match =~ s/((?:#$s*)?(\d+))/get_bug_link($2, $1);/eg;
         # Replace the old string with the linkified one.
         substr($text, $offset, $length) = $match;
     }
 
     my $comments_word = template_var('terms')->{comments};
 
-    my $comments_re = qr/(?:comments|\Q$comments_word\E)\s*\#?\s*
-                         \d+(?:\s*,\s*\#?\s*\d+)+/ix;
-    while ($text =~ m/($comments_re)/go) {
+    my $comments_re = qr/(?:comments|\Q$comments_word\E)$s*\#?$s*
+                         \d+(?:$s*,$s*\#?$s*\d+)+/ix;
+    while ($text =~ m/($comments_re)/g) {
         my $offset = $-[0];
         my $length = $+[0] - $-[0];
         my $match  = $1;
 
-        $match =~ s|((?:#\s*)?(\d+))|<a href="$current_bugurl#c$2">$1</a>|g;
+        $match =~ s|((?:#$s*)?(\d+))|<a href="$current_bugurl#c$2">$1</a>|g;
         substr($text, $offset, $length) = $match;
     }
 

From c634b6f651740c05fd2d0f8c83a89bf80a172449 Mon Sep 17 00:00:00 2001
From: Marc Schumann <wurblzap@gmail.com>
Date: Thu, 15 Aug 2013 13:27:00 +0200
Subject: [PATCH 173/240] Bug 853638 - Status and resolution values in
 dependency graphs not localizable. r=dkl, a=sgreen

---
 Bugzilla/Util.pm        | 2 +-
 showdependencygraph.cgi | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 8c88731e3..a3651182a 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -21,7 +21,7 @@ use parent qw(Exporter);
                              format_time validate_date validate_time datetime_from
                              is_7bit_clean bz_crypt generate_random_password
                              validate_email_syntax check_email_syntax clean_text
-                             get_text template_var disable_utf8
+                             get_text template_var display_value disable_utf8
                              detect_encoding email_filter
                              join_activity_entries);
 
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 9c45b2586..6445b6175 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -180,7 +180,7 @@ foreach my $k (@bug_ids) {
 
     # Resolution and summary are shown only if user can see the bug
     if (!$user->can_see_bug($k)) {
-        $resolution = $summary = '';
+        $summary = '';
     }
 
     $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id'));
@@ -213,7 +213,9 @@ foreach my $k (@bug_ids) {
     # Push the bug tooltip texts into a global hash so that 
     # CreateImagemap sub (used with local dot installations) can
     # use them later on.
-    $bugtitles{$k} = trim("$stat $resolution");
+    my $stat_display       = display_value('bug_status', $stat);
+    my $resolution_display = display_value('resolution', $resolution);
+    $bugtitles{$k} = trim("$stat_display $resolution_display");
 
     # Show the bug summary in tooltips only if not shown on 
     # the graph and it is non-empty (the user can see the bug)

From 5adf7808a2c2ae9b4d5a41458035796dc5098ef0 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Fri, 16 Aug 2013 09:08:20 +1000
Subject: [PATCH 174/240] Bug 902314 - Make the title and headings consistent
 on the pre enter bug pages r=dkl, a=sgreen

---
 template/en/default/global/choose-classification.html.tmpl | 5 +++--
 template/en/default/global/choose-product.html.tmpl        | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl
index a3aab9c29..0ecd68dc2 100644
--- a/template/en/default/global/choose-classification.html.tmpl
+++ b/template/en/default/global/choose-classification.html.tmpl
@@ -12,13 +12,14 @@
   #%]
 
 [% IF target == "enter_bug.cgi" %]
-  [% title = "Select Classification" %]
-  [% subheader = "Please select the classification." %]
+  [% title = "Enter $terms.Bug" %]
+  [% subheader = "Select Classification" %]
 [% END %]
 
 [% DEFAULT title = "Choose the classification" %]
 [% PROCESS global/header.html.tmpl %]
 
+<h2>First, you must pick a classification on which to enter [% terms.abug %]:</h2>
 <table>
   <tr>
     <th>
diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index 35a1f94a4..7bbe29c8c 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -17,7 +17,11 @@
 
 [% IF target == "enter_bug.cgi" %]
   [% title = "Enter $terms.Bug" %]
-  [% h2 = BLOCK %]First, you must pick a product on which to enter [% terms.abug %]: [% END %]
+  [% subheader = "Select Product" %]
+  [% h2 = BLOCK %]
+    [% IF Param('useclassification') %]Next[% ELSE %]First[% END %],
+    you must pick a product on which to enter [% terms.abug %]:
+  [% END %]
 [% ELSIF target == "describecomponents.cgi" %]
   [% title = "Browse" %]
   [% h2 = "Select a product category to browse:" %]

From 558af614d42e9c56af12846bb93ccb3d4a763de6 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Fri, 16 Aug 2013 09:12:57 +1000
Subject: [PATCH 175/240] Bug 365499 - admin/products/groupcontrol/confirm-edit
 uses p as br r=sgreen, a=sgreen

---
 .../groupcontrol/confirm-edit.html.tmpl       | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
index fc3ad9b82..354673c3d 100644
--- a/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/confirm-edit.html.tmpl
@@ -11,32 +11,41 @@
 [% END %]
 
 [% PROCESS global/header.html.tmpl title = title %]
+
 [% FOREACH group = mandatory_groups %]
-<P>
-group '[% group.name FILTER html %]' impacts [% group.count %] 
-[%+ terms.bugs %] for
-which the group is newly mandatory and will be added.
+  <p>
+    Group '[% group.name FILTER html %]' impacts 
+    [% IF group.count == 1 %]
+       one [%+ terms.bug %]
+    [% ELSE %]
+      [% group.count %] [%+ terms.bugs %]
+    [% END %]
+    for which this group is mandatory and will be added.
+  </p>
 [% END %]
 
 [% FOREACH group = na_groups %]
-<P>
-group '[% group.name FILTER html %]' impacts [% group.count %]&nbsp;
-[% terms.bugs %] for which the group is no longer applicable and will
-be removed.[% END %]
-<form action="editproducts.cgi" method="post" >
-
-  [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
-
-  <br>
-     Click "Continue" to proceed with the change including the changes
-     indicated above.  If you do not want these changes, use "back" to
-     return to the previous page.
   <p>
-    <input type="hidden" name="confirmed" value="confirmed">
-    <input type="submit" id="update" value="Continue">
+    Group '[% group.name FILTER html %]' impacts 
+    [% IF group.count == 1 %]
+       one [%+ terms.bug %]
+    [% ELSE %]
+      [% group.count %] [%+ terms.bugs %]
+    [% END %]  
+    for which this group is no longer applicable and will be removed.
   </p>
+[% END %]
 
+<form action="editproducts.cgi" method="post" >
+  [% PROCESS "global/hidden-fields.html.tmpl" exclude="^Bugzilla_(login|password)$" %]
+  <p>
+    <br>
+    Click "Continue" to proceed with the change including the changes
+    indicated above.  If you do not want these changes, use "back" to
+    return to the previous page.
+  </p>
+  <input type="hidden" name="confirmed" value="confirmed">
+  <input type="submit" id="update" value="Continue">
 </form>
 
-
 [% PROCESS global/footer.html.tmpl %]

From 7c1a180a0cd87f32cb6f9a6f5e5487bfcf1ef76f Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Sun, 18 Aug 2013 23:13:18 -0400
Subject: [PATCH 176/240] Bug 905537 - Add support for iPod Touch in useragent
 strings for platform detection r=LpSolit,a=sgreen

---
 Bugzilla/UserAgent.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/UserAgent.pm b/Bugzilla/UserAgent.pm
index 3c334d08d..844ec311f 100644
--- a/Bugzilla/UserAgent.pm
+++ b/Bugzilla/UserAgent.pm
@@ -49,7 +49,7 @@ use constant PLATFORMS_MAP => (
     # HP
     qr/\(.*9000.*\)/ => ["PA-RISC", "HP"],
     # ARM
-    qr/\(.*(?:iPad|iPhone).*\)/ => ["ARM"],
+    qr/\(.*(?:iPod|iPad|iPhone).*\)/ => ["ARM"],
     qr/\(.*ARM.*\)/ => ["ARM", "PocketPC"],
     # PocketPC intentionally before PowerPC
     qr/\(.*Windows CE.*PPC.*\)/ => ["ARM", "PocketPC"],
@@ -125,7 +125,7 @@ use constant OS_MAP => (
     qr/\(.*(?:iPad|iPhone).*OS 5.*\)/ => ["iOS 5"],
     qr/\(.*(?:iPad|iPhone).*OS 4.*\)/ => ["iOS 4"],
     qr/\(.*(?:iPad|iPhone).*OS 3.*\)/ => ["iOS 3"],
-    qr/\(.*(?:iPad|iPhone).*\)/ => ["iOS"],
+    qr/\(.*(?:iPod|iPad|iPhone).*\)/ => ["iOS"],
     qr/\(.*Mac OS X (?:|Mach-O |\()10.8.*\)/ => ["Mac OS X 10.8"],
     qr/\(.*Mac OS X (?:|Mach-O |\()10.7.*\)/ => ["Mac OS X 10.7"],
     qr/\(.*Mac OS X (?:|Mach-O |\()10.6.*\)/ => ["Mac OS X 10.6"],

From 1d70931abd470fb06285160e9f0ce03dc51ed0ea Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 19 Aug 2013 11:38:09 +0800
Subject: [PATCH 177/240] Bug 905948: under mod_perl, HTTP/200 is returned when
 etags match If-None-Match r=dkl, a=glob

---
 mod_perl.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mod_perl.pl b/mod_perl.pl
index 1f4593f00..572bcc7f9 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -135,9 +135,10 @@ sub handler : method {
     Bugzilla::init_page();
     my $result = $class->SUPER::handler(@_);
 
-    # When returning data from the REST api, tell Apache not to append its
-    # error html documents to the response.
-    return Bugzilla->usage_mode == USAGE_MODE_REST
+    # When returning data from the REST api we must only return 200 or 304,
+    # which tells Apache not to append its error html documents to the
+    # response.
+    return Bugzilla->usage_mode == USAGE_MODE_REST && $result != 304
            ? Apache2::Const::OK
            : $result;
 }

From b59d8c66da5ed8052f61580b95c4446a8600ed97 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 21 Aug 2013 15:59:50 -0400
Subject: [PATCH 178/240] Bug 907245 - Allow for URL params to also be passed
 with POST/PUT REST API requests r/a=glob

---
 Bugzilla/WebService/Server/REST.pm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Bugzilla/WebService/Server/REST.pm b/Bugzilla/WebService/Server/REST.pm
index 8d3aa481c..454749b5d 100644
--- a/Bugzilla/WebService/Server/REST.pm
+++ b/Bugzilla/WebService/Server/REST.pm
@@ -341,6 +341,14 @@ sub _retrieve_json_params {
                 ThrowUserError('json_rpc_invalid_params', { err_msg  => $@ });
             }
         }
+
+        # Allow parameters in the query string if request was not GET.
+        # Note: query string parameters will override any matching params
+        # also specified in the request body.
+        foreach my $param ($self->cgi->url_param()) {
+            $extra_params->{$param} = $self->cgi->url_param($param);
+        }
+
         %{$params} = (%{$params}, %{$extra_params}) if %{$extra_params};
     }
 
@@ -527,6 +535,9 @@ tells it how you want your data back. "Content-Type" must be "application/json".
 "Accept" can be either that, or "application/javascript" for JSONP - add a "callback"
 parameter to name your callback.
 
+Parameters may also be passed in as part of the query string  for non-GET requests
+and will override any matching parameters in the request body.
+
 =head1 AUTHENTICATION
 
 Along with viewing data as an anonymous user, you may also see private information

From 284aca4852b05cdb6e444560066cd6db799c8837 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 22 Aug 2013 14:14:21 +1000
Subject: [PATCH 179/240] Bug 252004 - Cannot change capitalisation of Keywords
 r=simon, a=glob

---
 Bugzilla/Keyword.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/Keyword.pm b/Bugzilla/Keyword.pm
index aedc6bcfc..77c9f5f77 100644
--- a/Bugzilla/Keyword.pm
+++ b/Bugzilla/Keyword.pm
@@ -105,7 +105,7 @@ sub _check_name {
 
     # We only want to validate the non-existence of the name if
     # we're creating a new Keyword or actually renaming the keyword.
-    if (!ref($self) || $self->name ne $name) {
+    if (!ref($self) || lc($self->name) ne lc($name)) {
         my $keyword = new Bugzilla::Keyword({ name => $name });
         ThrowUserError("keyword_already_exists", { name => $name }) if $keyword;
     }

From 545cb552c7350908be7af3a23c8fb29ff7862035 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Thu, 22 Aug 2013 14:20:26 +1000
Subject: [PATCH 180/240] Bug 891236 - Allow Redmine See Also URLs r=justdave,
 a=justdave

---
 extensions/MoreBugUrl/Extension.pm                               | 1 +
 .../hook/global/user-error-bug_url_invalid_tracker.html.tmpl     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm
index f2ca7150c..aa20a45f7 100644
--- a/extensions/MoreBugUrl/Extension.pm
+++ b/extensions/MoreBugUrl/Extension.pm
@@ -18,6 +18,7 @@ use constant MORE_SUB_CLASSES => qw(
     Bugzilla::Extension::MoreBugUrl::RT
     Bugzilla::Extension::MoreBugUrl::GetSatisfaction
     Bugzilla::Extension::MoreBugUrl::PHP
+    Bugzilla::Extension::MoreBugUrl::Redmine
 );
 
 # We need to update bug_see_also table because both
diff --git a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
index 0c62f6e5f..65592a973 100644
--- a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
+++ b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
@@ -12,3 +12,4 @@
 <li>A ticket in an RT installation.</li>
 <li>A topic on getsatisfaction.com.</li>
 <li>A b[% %]ug on b[% %]ugs.php.net.</li>
+<li>An issue in a Redmine installation.</li>

From cb123efa781f92107834ac96e3f41146152354c8 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Thu, 22 Aug 2013 14:21:16 +1000
Subject: [PATCH 181/240] Bug 891236 - Allow Redmine See Also URLs r=justdave,
 a=justdave

---
 extensions/MoreBugUrl/lib/Redmine.pm | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 extensions/MoreBugUrl/lib/Redmine.pm

diff --git a/extensions/MoreBugUrl/lib/Redmine.pm b/extensions/MoreBugUrl/lib/Redmine.pm
new file mode 100644
index 000000000..60c2ad90c
--- /dev/null
+++ b/extensions/MoreBugUrl/lib/Redmine.pm
@@ -0,0 +1,37 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::Extension::MoreBugUrl::Redmine;
+use strict;
+use base qw(Bugzilla::BugUrl);
+
+###############################
+####        Methods        ####
+###############################
+
+sub should_handle {
+    my ($class, $uri) = @_;
+    return ($uri->path =~ m|/issues/\d+$|) ? 1 : 0;
+}
+
+sub _check_value {
+    my $class = shift;
+
+    my $uri = $class->SUPER::_check_value(@_);
+
+    # Redmine URLs have only one form:
+    #   http://demo.redmine.com/issues/111
+
+    # Make sure there are no query parameters.
+    $uri->query(undef);
+    # And remove any # part if there is one.
+    $uri->fragment(undef);
+
+    return $uri;
+}
+
+1;

From 032832b2a91b9980aa222bf015b8335689e2be7a Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Fri, 23 Aug 2013 23:28:47 +1000
Subject: [PATCH 182/240] Bug 455016 - Documentation about "Boolean charts"
 talks about "equals" and so, while these choices have been renamed r=simon,
 a=glob

---
 docs/en/xml/using.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/en/xml/using.xml b/docs/en/xml/using.xml
index 42f1e4dd9..4c7239bac 100644
--- a/docs/en/xml/using.xml
+++ b/docs/en/xml/using.xml
@@ -550,7 +550,7 @@
           Sometimes, a query needs to compare a user-related field
           (such as ReportedBy) with a role-specific user (such as the
           user running the query or the user to whom each bug is assigned).
-          When the operator is either "equals" or "notequals", the value
+          When the operator is either "is equal to" or "is not equal to", the value
           can be "%reporter%", "%assignee%", "%qacontact%", or "%user%".
           The user pronoun
           refers to the user who is executing the query or, in the case
@@ -560,12 +560,12 @@
         </para>
         <para>
           Boolean charts also let you type a group name in any user-related
-          field if the operator is either "equals", "notequals" or "anyexact".
-          This will let you query for any member belonging (or not) to the
-          specified group. The group name must be entered following the
-          "%group.foo%" syntax, where "foo" is the group name.
-          So if you are looking for bugs reported by any user being in the
-          "editbugs" group, then you can type "%group.editbugs%".
+          field if the operator is either "is equal to", "is not equal to" or
+          "contains the string (exact case)". This will let you query for
+          any member belonging (or not) to the specified group. The group name
+          must be entered following the "%group.foo%" syntax, where "foo" is
+          the group name. So if you are looking for bugs reported by any user
+          being in the "editbugs" group, then you can type "%group.editbugs%".
         </para>
       </section>
       <section id="negation">
@@ -603,16 +603,16 @@
           negated. Negation permits queries such as
           <blockquote>
             <para>
-              NOT(("product" "equals" "update") OR 
-            ("component" "equals" "Documentation"))
+              NOT(("product" "is equal to" "update") OR 
+            ("component" "is equal to" "Documentation"))
             </para>
           </blockquote>
           to find bugs that are neither 
           in the update product or in the documentation component or
           <blockquote>
             <para>
-              NOT(("commenter" "equals" "%assignee%") OR 
-              ("component" "equals" "Documentation"))
+              NOT(("commenter" "is equal to" "%assignee%") OR 
+              ("component" "is equal to" "Documentation"))
             </para>
           </blockquote>
           to find non-documentation

From 9e35b73f8b0aea3c216e3eefed75c2be82fa25d3 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Fri, 23 Aug 2013 23:39:18 +1000
Subject: [PATCH 183/240] Bug 884705 - Bugzilla->user does not return undef
 r=simon, a=simon

---
 Bugzilla.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 2c0e303d9..24963858e 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -774,10 +774,10 @@ not an arrayref.
 
 =item C<user>
 
-C<undef> if there is no currently logged in user or if the login code has not
-yet been run.  If an sudo session is in progress, the C<Bugzilla::User>
-corresponding to the person who is being impersonated.  If no session is in
-progress, the current C<Bugzilla::User>.
+Default C<Bugzilla::User> object if there is no currently logged in user or
+if the login code has not yet been run.  If an sudo session is in progress,
+the C<Bugzilla::User> corresponding to the person who is being impersonated.
+If no session is in progress, the current C<Bugzilla::User>.
 
 =item C<set_user>
 

From 031d37e4d08817006d1be6f90aa374b763f352a9 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Tue, 27 Aug 2013 00:05:05 +0800
Subject: [PATCH 184/240] Bug 904568: emails generated by jobqueue.pl unable to
 reference custom fields r=simon, a=simon

---
 Bugzilla/Bug.pm    |  24 ++++++----
 Bugzilla/Object.pm | 111 ++++++++++++++++++++++++++-------------------
 2 files changed, 79 insertions(+), 56 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 842dacff4..302b58595 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -301,21 +301,11 @@ use constant EXTRA_REQUIRED_FIELDS => qw(creation_ts target_milestone cc qa_cont
 
 #####################################################################
 
-# This and "new" catch every single way of creating a bug, so that we
-# can call _create_cf_accessors.
-sub _do_list_select {
-    my $invocant = shift;
-    $invocant->_create_cf_accessors();
-    return $invocant->SUPER::_do_list_select(@_);
-}
-
 sub new {
     my $invocant = shift;
     my $class = ref($invocant) || $invocant;
     my $param = shift;
 
-    $class->_create_cf_accessors();
-
     # Remove leading "#" mark if we've just been passed an id.
     if (!ref $param && $param =~ /^#(\d+)$/) {
         $param = $1;
@@ -363,6 +353,10 @@ sub new {
     return $self;
 }
 
+sub initialize {
+    $_[0]->_create_cf_accessors();
+}
+
 sub cache_key {
     my $class = shift;
     my $key = $class->SUPER::cache_key(@_)
@@ -4316,6 +4310,16 @@ sub _multi_select_accessor {
 
 1;
 
+=head1 B<Methods>
+
+=over
+
+=item C<initialize>
+
+Ensures the accessors for custom fields are always created.
+
+=back
+
 =head1 B<Methods in need of POD>
 
 =over
diff --git a/Bugzilla/Object.pm b/Bugzilla/Object.pm
index 9f305e929..add5887a6 100644
--- a/Bugzilla/Object.pm
+++ b/Bugzilla/Object.pm
@@ -46,21 +46,24 @@ sub TO_JSON { return { %{ $_[0] } }; }
 sub new {
     my $invocant = shift;
     my $class    = ref($invocant) || $invocant;
-    my $object   = $class->_init(@_);
-    bless($object, $class) if $object;
+    my $param    = shift;
+
+    my $object = $class->_cache_get($param);
+    return $object if $object;
+
+    $object = $class->new_from_hash($class->_load_from_db($param));
+    $class->_cache_set($param, $object);
+
     return $object;
 }
 
-
 # Note: Because this uses sql_istrcmp, if you make a new object use
 # Bugzilla::Object, make sure that you modify bz_setup_database
 # in Bugzilla::DB::Pg appropriately, to add the right LOWER
 # index. You can see examples already there.
-sub _init {
+sub _load_from_db {
     my $class = shift;
     my ($param) = @_;
-    my $object = $class->_cache_get($param);
-    return $object if $object;
     my $dbh = Bugzilla->dbh;
     my $columns = join(',', $class->_get_db_columns);
     my $table   = $class->DB_TABLE;
@@ -72,17 +75,18 @@ sub _init {
         $id = $param->{id};
     }
 
+    my $object_data;
     if (defined $id) {
         # We special-case if somebody specifies an ID, so that we can
         # validate it as numeric.
         detaint_natural($id)
           || ThrowCodeError('param_must_be_numeric',
-                            {function => $class . '::_init'});
+                            {function => $class . '::_load_from_db'});
 
         # Too large integers make PostgreSQL crash.
         return if $id > MAX_INT_32;
 
-        $object = $dbh->selectrow_hashref(qq{
+        $object_data = $dbh->selectrow_hashref(qq{
             SELECT $columns FROM $table
              WHERE $id_field = ?}, undef, $id);
     } else {
@@ -109,15 +113,47 @@ sub _init {
         }
 
         map { trick_taint($_) } @values;
-        $object = $dbh->selectrow_hashref(
+        $object_data = $dbh->selectrow_hashref(
             "SELECT $columns FROM $table WHERE $condition", undef, @values);
     }
+    return $object_data;
+}
 
-    if ($object) {
-        $class->_serialisation_keys($object);
-        $class->_cache_set($param, $object);
+sub new_from_list {
+    my $invocant = shift;
+    my $class = ref($invocant) || $invocant;
+    my ($id_list) = @_;
+    my $id_field = $class->ID_FIELD;
+
+    my @detainted_ids;
+    foreach my $id (@$id_list) {
+        detaint_natural($id) ||
+            ThrowCodeError('param_must_be_numeric',
+                          {function => $class . '::new_from_list'});
+        # Too large integers make PostgreSQL crash.
+        next if $id > MAX_INT_32;
+        push(@detainted_ids, $id);
     }
-    return $object;
+
+    # We don't do $invocant->match because some classes have
+    # their own implementation of match which is not compatible
+    # with this one. However, match() still needs to have the right $invocant
+    # in order to do $class->DB_TABLE and so on.
+    return match($invocant, { $id_field => \@detainted_ids });
+}
+
+sub new_from_hash {
+    my $invocant = shift;
+    my $class = ref($invocant) || $invocant;
+    my $object_data = shift || return;
+    $class->_serialisation_keys($object_data);
+    bless($object_data, $class);
+    $object_data->initialize();
+    return $object_data;
+}
+
+sub initialize {
+    # abstract
 }
 
 # Provides a mechanism for objects to be cached in the request_cache
@@ -152,7 +188,7 @@ sub cache_key {
 sub _serialisation_keys {
     my ($class, $object) = @_;
     my $cache = Bugzilla->request_cache->{serialisation_keys} ||= {};
-    $cache->{$class} = [ keys %$object ] if $object;
+    $cache->{$class} = [ keys %$object ] if $object && !exists $cache->{$class};
     return @{ $cache->{$class} };
 }
 
@@ -189,36 +225,6 @@ sub check {
     return $obj;
 }
 
-sub new_from_list {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my ($id_list) = @_;
-    my $id_field = $class->ID_FIELD;
-
-    my @detainted_ids;
-    foreach my $id (@$id_list) {
-        detaint_natural($id) ||
-            ThrowCodeError('param_must_be_numeric',
-                          {function => $class . '::new_from_list'});
-        # Too large integers make PostgreSQL crash.
-        next if $id > MAX_INT_32;
-        push(@detainted_ids, $id);
-    }
-    # We don't do $invocant->match because some classes have
-    # their own implementation of match which is not compatible
-    # with this one. However, match() still needs to have the right $invocant
-    # in order to do $class->DB_TABLE and so on.
-    return match($invocant, { $id_field => \@detainted_ids });
-}
-
-sub new_from_hash {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $object = shift;
-    bless($object, $class);
-    return $object;
-}
-
 # Note: Future extensions to this could be:
 #  * Add a MATCH_JOIN constant so that we can join against
 #    certain other tables for the WHERE criteria.
@@ -318,8 +324,10 @@ sub _do_list_select {
     trick_taint($_) foreach @untainted;
     my $objects = $dbh->selectall_arrayref($sql, {Slice=>{}}, @untainted);
     $class->_serialisation_keys($objects->[0]) if @$objects;
-    bless($_, $class) foreach @$objects;
-    return $objects
+    foreach my $object (@$objects) {
+        $object = $class->new_from_hash($object);
+    }
+    return $objects;
 }
 
 ###############################
@@ -1029,6 +1037,17 @@ database matching the parameters you passed in.
 
 =back
 
+=item C<initialize>
+
+=over
+
+=item B<Description>
+
+Abstract method to allow subclasses to perform initialization tasks after an
+object has been created.
+
+=back
+
 =item C<check>
 
 =over

From e460e2a84e48f877f4dfc150f3b2e4cafe3e774b Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 26 Aug 2013 13:11:38 -0400
Subject: [PATCH 185/240] Bug 477601 - Adapt Bug.search to use Search.pm
 r=sgreen,a=glob

---
 Bugzilla/WebService/Bug.pm | 116 +++++++++++++++++++++++++------------
 1 file changed, 79 insertions(+), 37 deletions(-)

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 58405c2d0..5be07b7a3 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -25,6 +25,10 @@ use Bugzilla::Version;
 use Bugzilla::Milestone;
 use Bugzilla::Status;
 use Bugzilla::Token qw(issue_hash_token);
+use Bugzilla::Search;
+
+use List::Util qw(max);
+use List::MoreUtils qw(uniq);
 
 #############
 # Constants #
@@ -424,11 +428,13 @@ sub history {
 
 sub search {
     my ($self, $params) = @_;
+    my $user = Bugzilla->user;
+    my $dbh  = Bugzilla->dbh;
 
     Bugzilla->switch_to_shadow_db();
 
     if ( defined($params->{offset}) and !defined($params->{limit}) ) {
-        ThrowCodeError('param_required', 
+        ThrowCodeError('param_required',
                        { param => 'limit', function => 'Bug.search()' });
     }
 
@@ -444,53 +450,77 @@ sub search {
     }
 
     $params = Bugzilla::Bug::map_fields($params);
-    delete $params->{WHERE};
 
-    unless (Bugzilla->user->is_timetracker) {
-        delete $params->{$_} foreach TIMETRACKING_FIELDS;
-    }
+    my %options = ( fields => ['bug_id'] );
+
+    # Find the highest custom field id
+    my @field_ids = grep(/^f(\d+)$/, keys %$params);
+    my $last_field_id = @field_ids ? max @field_ids + 1 : 1;
 
     # Do special search types for certain fields.
-    if ( my $bug_when = delete $params->{delta_ts} ) {
-        $params->{WHERE}->{'delta_ts >= ?'} = $bug_when;
+    if (my $change_when = delete $params->{'delta_ts'}) {
+        $params->{"f${last_field_id}"} = 'delta_ts';
+        $params->{"o${last_field_id}"} = 'greaterthaneq';
+        $params->{"v${last_field_id}"} = $change_when;
+        $last_field_id++;
     }
-    if (my $when = delete $params->{creation_ts}) {
-        $params->{WHERE}->{'creation_ts >= ?'} = $when;
-    }
-    if (my $summary = delete $params->{short_desc}) {
-        my @strings = ref $summary ? @$summary : ($summary);
-        my @likes = ("short_desc LIKE ?") x @strings;
-        my $clause = join(' OR ', @likes);
-        $params->{WHERE}->{"($clause)"} = [map { "\%$_\%" } @strings];
-    }
-    if (my $whiteboard = delete $params->{status_whiteboard}) {
-        my @strings = ref $whiteboard ? @$whiteboard : ($whiteboard);
-        my @likes = ("status_whiteboard LIKE ?") x @strings;
-        my $clause = join(' OR ', @likes);
-        $params->{WHERE}->{"($clause)"} = [map { "\%$_\%" } @strings];
+    if (my $creation_when = delete $params->{'creation_ts'}) {
+        $params->{"f${last_field_id}"} = 'creation_ts';
+        $params->{"o${last_field_id}"} = 'greaterthaneq';
+        $params->{"v${last_field_id}"} = $creation_when;
+        $last_field_id++;
     }
 
+    # Some fields require a search type such as short desc, keywords, etc.
+    foreach my $param (qw(short_desc longdesc status_whiteboard bug_file_loc)) {
+        if (defined $params->{$param} && !defined $params->{$param . '_type'}) {
+            $params->{$param . '_type'} = 'allwordssubstr';
+        }
+    }
+    if (defined $params->{'keywords'} && !defined $params->{'keywords_type'}) {
+        $params->{'keywords_type'} = 'allwords';
+    }
+
+    # Backwards compatibility with old method regarding role search
+    $params->{'reporter'} = delete $params->{'creator'} if $params->{'creator'};
+    foreach my $role (qw(assigned_to reporter qa_contact longdesc cc)) {
+        next if !exists $params->{$role};
+        my $value = delete $params->{$role};
+        $params->{"f${last_field_id}"} = $role;
+        $params->{"o${last_field_id}"} = "anywordssubstr";
+        $params->{"v${last_field_id}"} = ref $value ? join(" ", @{$value}) : $value;
+        $last_field_id++;
+    }
+
+    my %match_params = %{ $params };
+    delete $params->{include_fields};
+    delete $params->{exclude_fields};
+
     # If no other parameters have been passed other than limit and offset
-    # and a WHERE parameter was not created earlier, then we throw error
-    # if system is configured to do so.
-    if (!$params->{WHERE} 
-        && !grep(!/(limit|offset)/i, keys %$params)
+    # then we throw error if system is configured to do so.
+    if (!grep(!/^(limit|offset)$/i, keys %$params)
         && !Bugzilla->params->{search_allow_no_criteria})
     {
         ThrowUserError('buglist_parameters_required');
     }
 
-    # We want include_fields and exclude_fields to be passed to
-    # _bug_to_hash but not to Bugzilla::Bug->match so we copy the 
-    # params and delete those before passing to Bugzilla::Bug->match.
-    my %match_params = %{ $params };
-    delete $match_params{'include_fields'};
-    delete $match_params{'exclude_fields'};
+    $options{order_columns} = [ split(/\s*,\s*/, delete $params->{order}) ] if $params->{order};
+    $options{params} = $params;
 
-    my $bugs = Bugzilla::Bug->match(\%match_params);
-    my $visible = Bugzilla->user->visible_bugs($bugs);
-    my @hashes = map { $self->_bug_to_hash($_, $params) } @$visible;
-    return { bugs => \@hashes };
+    my $search = new Bugzilla::Search(%options);
+    my ($data) = $search->data;
+
+    if (!scalar @$data) {
+        return { bugs => [] };
+    }
+
+    # Search.pm won't return bugs that the user shouldn't see so no filtering is needed.
+    my @bug_ids = map { $_->[0] } @$data;
+    my $bug_objects = Bugzilla::Bug->new_from_list(\@bug_ids);
+
+    my @bugs = map { $self->_bug_to_hash($_, \%match_params) } @$bug_objects;
+
+    return { bugs => \@bugs };
 }
 
 sub possible_duplicates {
@@ -2406,10 +2436,19 @@ the "Foo" or "Bar" products, you'd pass:
  product => ['Foo', 'Bar']
 
 Some Bugzillas may treat your arguments case-sensitively, depending
-on what database system they are using. Most commonly, though, Bugzilla is 
-not case-sensitive with the arguments passed (because MySQL is the 
+on what database system they are using. Most commonly, though, Bugzilla is
+not case-sensitive with the arguments passed (because MySQL is the
 most-common database to use with Bugzilla, and MySQL is not case sensitive).
 
+In addition to the fields listed below, you may also use criteria that
+is similar to what is used in the Advanced Search screen of the Bugzilla
+UI. This includes fields specified by C<Search by Change History> and
+C<Custom Search>. The easiest way to determine what the field names are and what
+format Bugzilla expects, is to first construct your query using the
+Advanced Search UI, execute it and use the query parameters in they URL
+as your key/value pairs for the WebService call. With REST, you can
+just reuse the query parameter portion in the REST call itself.
+
 =over
 
 =item C<alias>
@@ -2573,6 +2612,9 @@ by system configuration.
 
 =item REST API call added in Bugzilla B<5.0>.
 
+=item Updated to allow for full search capability similar to the Bugzilla UI 
+in Bugzilla B<5.0>.
+
 =back
 
 =back

From 3e5c74c544ea1f21b9d17d12cf6c37e61adc3db6 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 27 Aug 2013 08:30:29 +1000
Subject: [PATCH 186/240] Bug 601825 - "Linux Distributions" should link to the
 "Prerequisites" wiki page, not "Linux_Distro_Installation" r=simon, a=glob

---
 docs/en/xml/installation.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index d3ac86ee9..d68133fb7 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1736,20 +1736,20 @@ C:\perl&gt; <command>ppm install &lt;module name&gt;</command>
     </section>
 
     <section id="os-linux">
-      <title>Linux Distributions</title>
-            <para>Many Linux distributions include Bugzilla and its 
+      <title>Linux/BSD Distributions</title>
+            <para>Many Linux/BSD distributions include Bugzilla and its 
             dependencies in their native package management systems. 
-            Installing Bugzilla with root access on any Linux system 
+            Installing Bugzilla with root access on any Linux/BSD system 
             should be as simple as finding the Bugzilla package in the 
             package management application and installing it using the 
             normal command syntax. Several distributions also perform 
             the proper web server configuration automatically on installation.
             </para>
-            <para>Please consult the documentation of your Linux 
+            <para>Please consult the documentation of your Linux/BSD 
             distribution for instructions on how to install packages, 
             or for specific instructions on installing Bugzilla with 
             native package management tools. There is also a 
-            <ulink url="http://wiki.mozilla.org/Bugzilla:Linux_Distro_Installation">
+            <ulink url="https://wiki.mozilla.org/Bugzilla:Prerequisites">
             Bugzilla Wiki Page</ulink> for distro-specific installation
             notes.
             </para>

From 657a868adcd242a1e5e8758b91fa3dd73deb7121 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Tue, 27 Aug 2013 08:34:30 +1000
Subject: [PATCH 187/240] Bug 903337 - Do not display the CC list and the
 "Remove selected CCs" checkbox if the CC list is empty r=simon, a=glob

---
 template/en/default/attachment/create.html.tmpl | 2 +-
 template/en/default/attachment/edit.html.tmpl   | 2 +-
 template/en/default/bug/edit.html.tmpl          | 6 +++---
 template/en/default/bug/show-multiple.html.tmpl | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 8f5477e23..abc0f97bf 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -92,7 +92,7 @@ TUI_hide_default('attachment_text_field');
           cols    = constants.COMMENT_COLS
           wrap    = 'soft'
         %]
-        [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
+        [% IF NOT bug.cc.contains(user.login) %]
           <br>
           <input type="checkbox" id="addselfcc" name="addselfcc"
             [%~ ' checked="checked"'
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 67dcabd75..518737788 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -255,7 +255,7 @@
               wrap    = 'soft'
               classes = classNames
             %]
-            [% IF NOT attachment.bug.cc || NOT attachment.bug.cc.contains(user.login) %]
+            [% IF NOT attachment.bug.cc.contains(user.login) %]
               <input type="checkbox" id="addselfcc" name="addselfcc"
                 [%~ ' checked="checked"'
                     IF user.settings.state_addselfcc.value == 'always'
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 54e1cdb7a..683d6ed4a 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -738,7 +738,7 @@
       </th>
       <td>
         [% IF user.id %]
-          [% IF NOT bug.cc || NOT bug.cc.contains(user.login) %]
+          [% IF NOT bug.cc.contains(user.login) %]
             <input type="checkbox" id="addselfcc" name="addselfcc"
               [% " checked=\"checked\""
                    IF user.settings.state_addselfcc.value == 'always'
@@ -748,7 +748,7 @@
             <br> 
           [% END %]
         [% END %]
-        [% bug.cc.size || 0  FILTER html %] 
+        [% bug.cc.size FILTER html %] 
         [% IF bug.cc.size == 1 %]
           user
         [% ELSE %]
@@ -779,7 +779,7 @@
                 %]
             </div>
           [% END %]
-          [% IF bug.cc %]
+          [% IF bug.cc.size %]
             <select id="cc" multiple="multiple" size="5"
               [% IF bug.user.canedit %]name="cc"[% END %]>
               [% FOREACH c = bug.cc %]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index a20daedfa..e55a7cad4 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -76,7 +76,7 @@
       [% rightcells.push('qa_contact') %]
     [% END %]
     [% rightcells.push('') %]
-    [% IF bug.cc %]
+    [% IF bug.cc.size %]
       [% rightcells.push('cc') %]
     [% END %]
     [% IF bug.keywords %]

From 71dbb74acfb79bb19e4f425cddbe8f413779f45a Mon Sep 17 00:00:00 2001
From: Christopher Trom <chtrom@gmail.com>
Date: Tue, 27 Aug 2013 08:42:21 +1000
Subject: [PATCH 188/240] Bug 908572 - Grammatical error in "Query Defaults"
 admin params r=simon, a=glob

---
 template/en/default/admin/params/query.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/admin/params/query.html.tmpl b/template/en/default/admin/params/query.html.tmpl
index 901c19864..b3415cc83 100644
--- a/template/en/default/admin/params/query.html.tmpl
+++ b/template/en/default/admin/params/query.html.tmpl
@@ -54,7 +54,7 @@
     _ " XML, and other formats are exempted.) Users can click a link on the"
     _ " search result page to see all the results."
     _ "<p>Usually you should not have to change this--the default value"
-    _ " should be acceptable for almost most installations.</p>",
+    _ " should be acceptable for most installations.</p>",
 
   max_search_results =>
     "The maximum number of $terms.bugs that a search can"

From 2e15132e6e88301fda8c5c6dccca0a91d7c879b2 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 26 Aug 2013 23:21:15 -0400
Subject: [PATCH 189/240] Bug 908338 - Create a new webservice called
 User.valid_login that will verify if a cookie or login token is valid for the
 current user r=glob,a=sgreen

---
 .../WebService/Server/REST/Resources/User.pm  |  5 ++
 Bugzilla/WebService/User.pm                   | 55 +++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/Bugzilla/WebService/Server/REST/Resources/User.pm b/Bugzilla/WebService/Server/REST/Resources/User.pm
index 1f82f752d..e2a2ea260 100644
--- a/Bugzilla/WebService/Server/REST/Resources/User.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/User.pm
@@ -19,6 +19,11 @@ BEGIN {
 
 sub _rest_resources {
     my $rest_resources = [
+        qr{^/valid_login$}, {
+            GET => {
+                method => 'valid_login'
+            }
+        },
         qr{^/user$}, {
             GET  => {
                 method => 'get'
diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index 08c812076..44938a97a 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -83,6 +83,17 @@ sub logout {
     return undef;
 }
 
+sub valid_login {
+    my ($self, $params) = @_;
+    defined $params->{login}
+        || ThrowCodeError('param_required', { param => 'login' });
+    Bugzilla->login();
+    if (Bugzilla->user->id && Bugzilla->user->login eq $params->{login}) {
+        return $self->type('boolean', 1);
+    }
+    return $self->type('boolean', 0);
+}
+
 #################
 # User Creation #
 #################
@@ -486,6 +497,50 @@ Log out the user. Does nothing if there is no user logged in.
 
 =back
 
+=head2 valid_login
+
+B<UNSTABLE>
+
+=over
+
+=item B<Description>
+
+This method will verify whether a client's cookies or current login
+token is still valid or have expired. A valid username must be provided
+as well that matches.
+
+=item B<Params>
+
+=over
+
+=item C<login>
+
+The login name that matches the provided cookies or token.
+
+=item C<token>
+
+(string) Persistent login token current being used for authentication (optional).
+Cookies passed by client will be used before the token if both provided.
+
+=back
+
+=item B<Returns>
+
+Returns true/false depending on if the current cookies or token are valid
+for the provided username.
+
+=item B<Errors> (none)
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
 =head1 Account Creation and Modification
 
 =head2 offer_account_by_email

From e631a8c25f971091d1e6d68bb5da92280eb986d3 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 26 Aug 2013 23:54:32 -0400
Subject: [PATCH 190/240] Bug 893195 - Allow token based authentication for
 webservices r=glob,a=sgreen

---
 Bugzilla/Auth.pm                              | 17 +++++
 Bugzilla/Auth/Login.pm                        |  2 +-
 Bugzilla/Auth/Login/Cookie.pm                 | 68 +++++++++++++++----
 Bugzilla/Auth/Persist/Cookie.pm               | 32 ++++++---
 Bugzilla/WebService/Server/JSONRPC.pm         |  6 +-
 Bugzilla/WebService/Server/REST.pm            | 38 ++++++-----
 .../WebService/Server/REST/Resources/User.pm  | 10 +++
 Bugzilla/WebService/User.pm                   | 29 ++++++--
 Bugzilla/WebService/Util.pm                   | 23 +++++++
 9 files changed, 178 insertions(+), 47 deletions(-)

diff --git a/Bugzilla/Auth.pm b/Bugzilla/Auth.pm
index 412edd5a1..c46e554a3 100644
--- a/Bugzilla/Auth.pm
+++ b/Bugzilla/Auth.pm
@@ -109,6 +109,15 @@ sub can_logout {
     return $getter->can_logout;
 }
 
+sub login_token {
+    my ($self) = @_;
+    my $getter = $self->{_info_getter}->{successful};
+    if ($getter && $getter->isa('Bugzilla::Auth::Login::Cookie')) {
+        return $getter->login_token;
+    }
+    return undef;
+}
+
 sub user_can_create_account {
     my ($self) = @_;
     my $verifier = $self->{_verifier}->{successful};
@@ -410,6 +419,14 @@ Params:      None
 Returns:     C<true> if users can change their own email address,
              C<false> otherwise.
 
+=item C<login_token>
+
+Description: If a login token was used instead of a cookie then this
+             will return the current login token data such as user id
+             and the token itself.
+Params:      None
+Returns:     A hash containing C<login_token> and C<user_id>.
+
 =back
 
 =head1 STRUCTURE
diff --git a/Bugzilla/Auth/Login.pm b/Bugzilla/Auth/Login.pm
index 33d63a425..ddc172689 100644
--- a/Bugzilla/Auth/Login.pm
+++ b/Bugzilla/Auth/Login.pm
@@ -9,7 +9,7 @@ package Bugzilla::Auth::Login;
 
 use 5.10.1;
 use strict;
-use fields qw();
+use fields qw(_login_token);
 
 # Determines whether or not a user can logout. It's really a subroutine,
 # but we implement it here as a constant. Override it in subclasses if
diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm
index 56bc34f40..130fab8e3 100644
--- a/Bugzilla/Auth/Login/Cookie.pm
+++ b/Bugzilla/Auth/Login/Cookie.pm
@@ -20,7 +20,8 @@ use List::Util qw(first);
 use constant requires_persistence  => 0;
 use constant requires_verification => 0;
 use constant can_login => 0;
-use constant is_automatic => 1;
+
+sub is_automatic { return $_[0]->login_token ? 0 : 1; }
 
 # Note that Cookie never consults the Verifier, it always assumes
 # it has a valid DB account or it fails.
@@ -28,24 +29,35 @@ sub get_login_info {
     my ($self) = @_;
     my $cgi = Bugzilla->cgi;
     my $dbh = Bugzilla->dbh;
+    my ($user_id, $login_cookie);
 
-    my $ip_addr      = remote_ip();
-    my $login_cookie = $cgi->cookie("Bugzilla_logincookie");
-    my $user_id      = $cgi->cookie("Bugzilla_login");
+    if (!Bugzilla->request_cache->{auth_no_automatic_login}) {
+        $login_cookie = $cgi->cookie("Bugzilla_logincookie");
+        $user_id      = $cgi->cookie("Bugzilla_login");
 
-    # If cookies cannot be found, this could mean that they haven't
-    # been made available yet. In this case, look at Bugzilla_cookie_list.
-    unless ($login_cookie) {
-        my $cookie = first {$_->name eq 'Bugzilla_logincookie'}
-                            @{$cgi->{'Bugzilla_cookie_list'}};
-        $login_cookie = $cookie->value if $cookie;
+        # If cookies cannot be found, this could mean that they haven't
+        # been made available yet. In this case, look at Bugzilla_cookie_list.
+        unless ($login_cookie) {
+            my $cookie = first {$_->name eq 'Bugzilla_logincookie'}
+                                @{$cgi->{'Bugzilla_cookie_list'}};
+            $login_cookie = $cookie->value if $cookie;
+        }
+        unless ($user_id) {
+            my $cookie = first {$_->name eq 'Bugzilla_login'}
+                                @{$cgi->{'Bugzilla_cookie_list'}};
+            $user_id = $cookie->value if $cookie;
+        }
     }
-    unless ($user_id) {
-        my $cookie = first {$_->name eq 'Bugzilla_login'}
-                            @{$cgi->{'Bugzilla_cookie_list'}};
-        $user_id = $cookie->value if $cookie;
+
+    # If no cookies were provided, we also look for a login token
+    # passed in the parameters of a webservice
+    my $token = $self->login_token;
+    if ($token && (!$login_cookie || !$user_id)) {
+        ($user_id, $login_cookie) = ($token->{'user_id'}, $token->{'login_token'});
     }
 
+    my $ip_addr = remote_ip();
+
     if ($login_cookie && $user_id) {
         # Anything goes for these params - they're just strings which
         # we're going to verify against the db
@@ -78,4 +90,32 @@ sub get_login_info {
     return { failure => AUTH_NODATA };
 }
 
+sub login_token {
+    my ($self) = @_;
+    my $input      = Bugzilla->input_params;
+    my $usage_mode = Bugzilla->usage_mode;
+
+    return $self->{'_login_token'} if exists $self->{'_login_token'};
+
+    if ($usage_mode ne USAGE_MODE_XMLRPC
+        && $usage_mode ne USAGE_MODE_JSON
+        && $usage_mode ne USAGE_MODE_REST) {
+        return $self->{'_login_token'} = undef;
+    }
+
+    # Check if a token was passed in via requests for WebServices
+    my $token = trim(delete $input->{'Bugzilla_token'});
+    return $self->{'_login_token'} = undef if !$token;
+
+    my ($user_id, $login_token) = split('-', $token, 2);
+    if (!detaint_natural($user_id) || !$login_token) {
+        return $self->{'_login_token'} = undef;
+    }
+
+    return $self->{'_login_token'} = {
+        user_id     => $user_id,
+        login_token => $login_token
+    };
+}
+
 1;
diff --git a/Bugzilla/Auth/Persist/Cookie.pm b/Bugzilla/Auth/Persist/Cookie.pm
index 15a2d490e..9681bcea2 100644
--- a/Bugzilla/Auth/Persist/Cookie.pm
+++ b/Bugzilla/Auth/Persist/Cookie.pm
@@ -15,6 +15,8 @@ use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Token;
 
+use Bugzilla::Auth::Login::Cookie qw(login_token);
+
 use List::Util qw(first);
 
 sub new {
@@ -86,6 +88,7 @@ sub logout {
 
     my $dbh = Bugzilla->dbh;
     my $cgi = Bugzilla->cgi;
+    my $input = Bugzilla->input_params;
     $param = {} unless $param;
     my $user = $param->{user} || Bugzilla->user;
     my $type = $param->{type} || LOGOUT_ALL;
@@ -99,16 +102,23 @@ sub logout {
     # The LOGOUT_*_CURRENT options require the current login cookie.
     # If a new cookie has been issued during this run, that's the current one.
     # If not, it's the one we've received.
+    my @login_cookies;
     my $cookie = first {$_->name eq 'Bugzilla_logincookie'}
                        @{$cgi->{'Bugzilla_cookie_list'}};
-    my $login_cookie;
     if ($cookie) {
-        $login_cookie = $cookie->value;
+        push(@login_cookies, $cookie->value);
     }
     else {
-        $login_cookie = $cgi->cookie("Bugzilla_logincookie");
+        push(@login_cookies, $cgi->cookie("Bugzilla_logincookie"));
     }
-    trick_taint($login_cookie);
+
+    # If we are a webservice using a token instead of cookie
+    # then add that as well to the login cookies to delete
+    if (my $login_token = $user->authorizer->login_token) {
+        push(@login_cookies, $login_token->{'login_token'});
+    }
+
+    return if !@login_cookies;
 
     # These queries use both the cookie ID and the user ID as keys. Even
     # though we know the userid must match, we still check it in the SQL
@@ -117,12 +127,18 @@ sub logout {
     # logged in and got the same cookie, we could be logging the other
     # user out here. Yes, this is very very very unlikely, but why take
     # chances? - bbaetz
+    map { trick_taint($_) } @login_cookies;
+    @login_cookies = map { $dbh->quote($_) } @login_cookies;
     if ($type == LOGOUT_KEEP_CURRENT) {
-        $dbh->do("DELETE FROM logincookies WHERE cookie != ? AND userid = ?",
-                 undef, $login_cookie, $user->id);
+        $dbh->do("DELETE FROM logincookies WHERE " .
+                 $dbh->sql_in('cookie', \@login_cookies, 1) .
+                 " AND userid = ?",
+                 undef, $user->id);
     } elsif ($type == LOGOUT_CURRENT) {
-        $dbh->do("DELETE FROM logincookies WHERE cookie = ? AND userid = ?",
-                 undef, $login_cookie, $user->id);
+        $dbh->do("DELETE FROM logincookies WHERE " .
+                 $dbh->sql_in('cookie', \@login_cookies) .
+                 " AND userid = ?",
+                 undef, $user->id);
     } else {
         die("Invalid type $type supplied to logout()");
     }
diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm
index e7b3fe7e7..5290caa5d 100644
--- a/Bugzilla/WebService/Server/JSONRPC.pm
+++ b/Bugzilla/WebService/Server/JSONRPC.pm
@@ -25,7 +25,7 @@ BEGIN {
 
 use Bugzilla::Error;
 use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Util qw(taint_data);
+use Bugzilla::WebService::Util qw(taint_data fix_credentials);
 use Bugzilla::Util;
 
 use HTTP::Message;
@@ -373,6 +373,10 @@ sub _argument_type_check {
         }
     }
 
+    # Update the params to allow for several convenience key/values
+    # use for authentication
+    fix_credentials($params);
+
     Bugzilla->input_params($params);
 
     if ($self->request->method eq 'POST') {
diff --git a/Bugzilla/WebService/Server/REST.pm b/Bugzilla/WebService/Server/REST.pm
index 454749b5d..4145455ec 100644
--- a/Bugzilla/WebService/Server/REST.pm
+++ b/Bugzilla/WebService/Server/REST.pm
@@ -16,7 +16,7 @@ use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Util qw(taint_data);
+use Bugzilla::WebService::Util qw(taint_data fix_credentials);
 use Bugzilla::Util qw(correct_urlbase html_quote);
 
 # Load resource modules
@@ -69,7 +69,7 @@ sub handle {
 
     my $params = $self->_retrieve_json_params;
 
-    $self->_fix_credentials($params);
+    fix_credentials($params);
 
     # Fix includes/excludes for each call
     rest_include_exclude($params);
@@ -131,7 +131,7 @@ sub response {
 
     # If accessing through web browser, then display in readable format
     if ($self->content_type eq 'text/html') {
-        $result = $self->json->pretty->canonical->encode($result);
+        $result = $self->json->pretty->canonical->allow_nonref->encode($result);
 
         my $template = Bugzilla->template;
         $content = "";
@@ -162,8 +162,15 @@ sub handle_login {
     # explicitly gives that site their username and password. (This is
     # particularly important for JSONP, which would allow a remote site
     # to use private data without the user's knowledge, unless we had this
-    # protection in place.)
-    if (!grep($_ eq $self->request->method, ('POST', 'PUT'))) {
+    # protection in place.) We do allow this for GET /login as we need to
+    # for Bugzilla::Auth::Persist::Cookie to create a login cookie that we
+    # can also use for Bugzilla_token support. This is OK as it requires
+    # a login and password to be supplied and will fail if they are not
+    # valid for the user.
+    if (!grep($_ eq $self->request->method, ('POST', 'PUT'))
+        && !($self->bz_class_name eq 'Bugzilla::WebService::User'
+            && $self->bz_method_name eq 'login'))
+    {
         # XXX There's no particularly good way for us to get a parameter
         # to Bugzilla->login at this point, so we pass this information
         # around using request_cache, which is a bit of a hack. The
@@ -424,15 +431,6 @@ sub _find_resource {
     return $handler_found;
 }
 
-sub _fix_credentials {
-    my ($self, $params) = @_;
-    # Allow user to pass in &username=foo&password=bar
-    if (exists $params->{'username'} && exists $params->{'password'}) {
-        $params->{'Bugzilla_login'}    = delete $params->{'username'};
-        $params->{'Bugzilla_password'} = delete $params->{'password'};
-    }
-}
-
 sub _best_content_type {
     my ($self, @types) = @_;
     return ($self->_simple_content_negotiation(@types))[0] || '*/*';
@@ -545,15 +543,23 @@ if you have a Bugzilla account by providing your login credentials.
 
 =over
 
-=item Username and password
+=item Login name and password
 
 Pass in as query parameters of any request:
 
-username=fred@bedrock.com&password=ilovewilma
+login=fred@example.com&password=ilovecheese
 
 Remember to URL encode any special characters, which are often seen in passwords and to
 also enable SSL support.
 
+=item Login token
+
+By calling GET /login?login=fred@example.com&password=ilovecheese, you get back
+a C<token> value which can then be passed to each subsequent call as
+authentication. This is useful for third party clients that cannot use cookies
+and do not want to store a user's login and password in the client. You can also
+pass in "token" as a convenience.
+
 =back
 
 =head1 ERRORS
diff --git a/Bugzilla/WebService/Server/REST/Resources/User.pm b/Bugzilla/WebService/Server/REST/Resources/User.pm
index e2a2ea260..539a9313a 100644
--- a/Bugzilla/WebService/Server/REST/Resources/User.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/User.pm
@@ -19,6 +19,16 @@ BEGIN {
 
 sub _rest_resources {
     my $rest_resources = [
+        qr{^/login$}, {
+            GET => {
+                method => 'login'
+            }
+        },
+        qr{^/logout$}, {
+            GET => {
+                method => 'logout'
+            }
+        },
         qr{^/valid_login$}, {
             GET => {
                 method => 'valid_login'
diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index 44938a97a..ba8640f3d 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -19,6 +19,8 @@ use Bugzilla::User;
 use Bugzilla::Util qw(trim);
 use Bugzilla::WebService::Util qw(filter validate translate params_to_objects);
 
+use List::Util qw(first);
+
 # Don't need auth to login
 use constant LOGIN_EXEMPT => {
     login => 1,
@@ -73,14 +75,25 @@ sub login {
     $input_params->{'Bugzilla_password'} = $params->{password};
     $input_params->{'Bugzilla_remember'} = $remember;
 
-    Bugzilla->login();
-    return { id => $self->type('int', Bugzilla->user->id) };
+    my $user = Bugzilla->login();
+
+    my $result = { id => $self->type('int', $user->id) };
+
+    # We will use the stored cookie value combined with the user id
+    # to create a token that can be used with future requests in the
+    # query parameters
+    my $login_cookie = first { $_->name eq 'Bugzilla_logincookie' }
+                              @{ Bugzilla->cgi->{'Bugzilla_cookie_list'} };
+    if ($login_cookie) {
+        $result->{'token'} = $user->id . "-" . $login_cookie->value;
+    }
+
+    return $result;
 }
 
 sub logout {
     my $self = shift;
     Bugzilla->logout;
-    return undef;
 }
 
 sub valid_login {
@@ -448,10 +461,12 @@ management of cookies across sessions.
 
 =item B<Returns>
 
-On success, a hash containing one item, C<id>, the numeric id of the
-user that was logged in.  A set of http cookies is also sent with the
-response.  These cookies must be sent along with any future requests
-to the webservice, for the duration of the session.
+On success, a hash containing two items, C<id>, the numeric id of the
+user that was logged in, and a C<token> which can be passed in
+the parameters as authentication in other calls. A set of http cookies
+is also sent with the response. These cookies *or* the token can be sent
+along with any future requests to the webservice, for the duration of the
+session.
 
 =item B<Errors>
 
diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index c24f95923..be7251532 100644
--- a/Bugzilla/WebService/Util.pm
+++ b/Bugzilla/WebService/Util.pm
@@ -23,6 +23,7 @@ our @EXPORT_OK = qw(
     validate
     translate
     params_to_objects
+    fix_credentials
 );
 
 sub filter ($$;$) {
@@ -146,6 +147,22 @@ sub params_to_objects {
     return \@objects;
 }
 
+sub fix_credentials {
+    my ($params) = @_;
+    # Allow user to pass in login=foo&password=bar as a convenience
+    # even if not calling GET /login. We also do not delete them as
+    # GET /login requires "login" and "password".
+    if (exists $params->{'login'} && exists $params->{'password'}) {
+        $params->{'Bugzilla_login'}    = $params->{'login'};
+        $params->{'Bugzilla_password'} = $params->{'password'};
+    }
+    # Allow user to pass token=12345678 as a convenience which becomes
+    # "Bugzilla_token" which is what the auth code looks for.
+    if (exists $params->{'token'}) {
+        $params->{'Bugzilla_token'} = $params->{'token'};
+    }
+}
+
 __END__
 
 =head1 NAME
@@ -209,6 +226,12 @@ Helps make life simpler for WebService methods that internally create objects
 via both "ids" and "names" fields. Also de-duplicates objects that were loaded
 by both "ids" and "names". Returns an arrayref of objects.
 
+=head2 fix_credentials
+
+Allows for certain parameters related to authentication such as Bugzilla_login,
+Bugzilla_password, and Bugzilla_token to have shorter named equivalents passed in.
+This function converts the shorter versions to their respective internal names.
+
 =head1 B<Methods in need of POD>
 
 =over

From bdfbc06059b8e1e227005acdcde0d3e82361e00e Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Fri, 30 Aug 2013 18:35:41 +1000
Subject: [PATCH 191/240] Bug 903895 - Allow more than 32k components r=gerv,
 a=sgreen

---
 Bugzilla/DB/Schema.pm  | 10 +++++-----
 Bugzilla/Install/DB.pm | 24 ++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 0d8396df5..c619a5780 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -254,7 +254,7 @@ use constant ABSTRACT_SCHEMA => {
                                     REFERENCES => {TABLE  => 'profiles',
                                                    COLUMN => 'userid'}},
             version             => {TYPE => 'varchar(64)', NOTNULL => 1},
-            component_id        => {TYPE => 'INT2', NOTNULL => 1,
+            component_id        => {TYPE => 'INT3', NOTNULL => 1,
                                     REFERENCES => {TABLE  => 'components',
                                                    COLUMN => 'id'}},
             resolution          => {TYPE => 'varchar(64)',
@@ -634,7 +634,7 @@ use constant ABSTRACT_SCHEMA => {
                              REFERENCES => {TABLE  => 'products',
                                             COLUMN => 'id',
                                             DELETE => 'CASCADE'}},
-            component_id => {TYPE => 'INT2',
+            component_id => {TYPE => 'INT3',
                              REFERENCES => {TABLE  => 'components',
                                             COLUMN => 'id',
                                             DELETE => 'CASCADE'}},
@@ -655,7 +655,7 @@ use constant ABSTRACT_SCHEMA => {
                              REFERENCES => {TABLE  => 'products',
                                             COLUMN => 'id',
                                             DELETE => 'CASCADE'}},
-            component_id => {TYPE => 'INT2',
+            component_id => {TYPE => 'INT3',
                              REFERENCES => {TABLE  => 'components',
                                             COLUMN => 'id',
                                             DELETE => 'CASCADE'}},
@@ -1069,7 +1069,7 @@ use constant ABSTRACT_SCHEMA => {
                              REFERENCES => {TABLE  => 'profiles',
                                             COLUMN => 'userid',
                                             DELETE => 'CASCADE'}},
-            component_id => {TYPE => 'INT2', NOTNULL => 1,
+            component_id => {TYPE => 'INT3', NOTNULL => 1,
                              REFERENCES => {TABLE  => 'components',
                                             COLUMN => 'id',
                                             DELETE => 'CASCADE'}},
@@ -1347,7 +1347,7 @@ use constant ABSTRACT_SCHEMA => {
 
     components => {
         FIELDS => [
-            id               => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
+            id               => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
                                  PRIMARYKEY => 1},
             name             => {TYPE => 'varchar(64)', NOTNULL => 1},
             product_id       => {TYPE => 'INT2', NOTNULL => 1,
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index a45c5a5ea..a463fe879 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -711,6 +711,9 @@ sub update_table_definitions {
     # 2013-02-04 dkl@mozilla.com - Bug 824346
     _fix_flagclusions_indexes();
 
+    # 2013-08-26 sgreen@redhat.com - Bug 903895
+    _fix_components_primary_key();
+
     ################################################################
     # New --TABLE-- changes should go *** A B O V E *** this point #
     ################################################################
@@ -1429,9 +1432,9 @@ sub _use_ids_for_products_and_components {
         print "Updating the database to use component IDs.\n";
 
         $dbh->bz_add_column("components", "id",
-            {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+            {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
         $dbh->bz_add_column("bugs", "component_id",
-                            {TYPE => 'INT2', NOTNULL => 1}, 0);
+                            {TYPE => 'INT3', NOTNULL => 1}, 0);
 
         my %components;
         $sth = $dbh->prepare("SELECT id, value, product_id FROM components");
@@ -3852,6 +3855,23 @@ sub _fix_flagclusions_indexes {
     }
 }
 
+sub _fix_components_primary_key {
+    my $dbh = Bugzilla->dbh;
+    if ($dbh->bz_column_info('components', 'id')->{TYPE} ne 'MEDIUMSERIAL') {
+        $dbh->bz_drop_related_fks('components', 'id');
+        $dbh->bz_alter_column("components", "id",
+                              {TYPE => 'MEDIUMSERIAL',  NOTNULL => 1,  PRIMARYKEY => 1});
+        $dbh->bz_alter_column("flaginclusions", "component_id",
+                              {TYPE => 'INT3'});
+        $dbh->bz_alter_column("flagexclusions", "component_id",
+                              {TYPE => 'INT3'});
+        $dbh->bz_alter_column("bugs", "component_id",
+                              {TYPE => 'INT3', NOTNULL => 1});
+        $dbh->bz_alter_column("component_cc", "component_id",
+                              {TYPE => 'INT3', NOTNULL => 1});
+    }
+}
+
 1;
 
 __END__

From 8ea4cca9e7b515cfea319d5ce909d83407ed3cd8 Mon Sep 17 00:00:00 2001
From: Christopher Trom <chtrom@gmail.com>
Date: Fri, 30 Aug 2013 18:46:24 +1000
Subject: [PATCH 192/240] Bug 547311 - Remove the "align" attribute from <th>
 r=simon, a=sgreen

---
 skins/standard/global.css                                     | 3 +++
 template/en/default/admin/classifications/del.html.tmpl       | 4 ++--
 template/en/default/admin/components/confirm-delete.html.tmpl | 4 ++--
 .../en/default/admin/custom_fields/confirm-delete.html.tmpl   | 4 ++--
 .../en/default/admin/fieldvalues/confirm-delete.html.tmpl     | 4 ++--
 template/en/default/admin/fieldvalues/edit.html.tmpl          | 2 +-
 template/en/default/admin/milestones/confirm-delete.html.tmpl | 4 ++--
 template/en/default/admin/products/confirm-delete.html.tmpl   | 4 ++--
 template/en/default/admin/table.html.tmpl                     | 2 +-
 template/en/default/admin/versions/confirm-delete.html.tmpl   | 4 ++--
 template/en/default/attachment/confirm-delete.html.tmpl       | 4 ++--
 template/en/default/attachment/diff-file.html.tmpl            | 2 +-
 template/en/default/attachment/list.html.tmpl                 | 2 +-
 template/en/default/global/choose-product.html.tmpl           | 2 +-
 14 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/skins/standard/global.css b/skins/standard/global.css
index b1c9a7d07..51d7c29db 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -573,3 +573,6 @@ input.required, select.required, span.required_explanation {
 form th {
     text-align: right;
 }
+th.left {
+    text-align: left;
+}
\ No newline at end of file
diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl
index 215db848f..83e0812ab 100644
--- a/template/en/default/admin/classifications/del.html.tmpl
+++ b/template/en/default/admin/classifications/del.html.tmpl
@@ -12,8 +12,8 @@
 
 <table border=1 cellpadding=4 cellspacing=0>
 <tr bgcolor="#6666ff">
-  <th valign="top" align="left">Part</th>
-  <th valign="top" align="left">Value</th>
+  <th valign="top" class="left">Part</th>
+  <th valign="top" class="left">Value</th>
 
 </tr><tr>
   <td valign="top">Classification:</td>
diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl
index 82bf018b3..bbd5ce200 100644
--- a/template/en/default/admin/components/confirm-delete.html.tmpl
+++ b/template/en/default/admin/components/confirm-delete.html.tmpl
@@ -24,8 +24,8 @@ from '[% product.name FILTER html %]' product
 
 <table border="1" cellpadding="4" cellspacing="0">
 <tr bgcolor="#6666FF">
-  <th valign="top" align="left">Field</th>
-  <th valign="top" align="left">Value</th>
+  <th valign="top" class="left">Field</th>
+  <th valign="top" class="left">Value</th>
 </tr>
 <tr>
   <td valign="top">Component:</td>
diff --git a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
index 85338c003..0b7c8814c 100644
--- a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
+++ b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
@@ -25,8 +25,8 @@
 
 <table border="1" cellpadding="4" cellspacing="0">
 <tr bgcolor="#6666FF">
-  <th valign="top" align="left">Field</th>
-  <th valign="top" align="left">Value</th>
+  <th valign="top" class="left">Field</th>
+  <th valign="top" class="left">Value</th>
 </tr>
 <tr>
   <td valign="top">Custom Field:</td>
diff --git a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
index 122df3612..a37ff73d4 100644
--- a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
+++ b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
@@ -24,8 +24,8 @@
 
 <table border="1" cellpadding="4" cellspacing="0">
 <tr bgcolor="#6666FF">
-  <th valign="top" align="left">Field</th>
-  <th valign="top" align="left">Value</th>
+  <th valign="top" class="left">Field</th>
+  <th valign="top" class="left">Value</th>
 </tr>
 <tr>
   <td valign="top">Field Name:</td>
diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index 90ac419c6..d076e3071 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -23,7 +23,7 @@
   <table border="0" cellpadding="4" cellspacing="0">
 
     <tr>
-      <th valign="top" align="right">
+      <th valign="top">
         <label for="value_new">Field Value:</label>
       </th>
       <td>
diff --git a/template/en/default/admin/milestones/confirm-delete.html.tmpl b/template/en/default/admin/milestones/confirm-delete.html.tmpl
index cc30f164f..7efee02b9 100644
--- a/template/en/default/admin/milestones/confirm-delete.html.tmpl
+++ b/template/en/default/admin/milestones/confirm-delete.html.tmpl
@@ -23,8 +23,8 @@
 
 <table border="1" cellpadding="4" cellspacing="0">
 <tr bgcolor="#6666FF">
-  <th valign="top" align="left">Field</th>
-  <th valign="top" align="left">Value</th>
+  <th valign="top" class="left">Field</th>
+  <th valign="top" class="left">Value</th>
 </tr>
 <tr>
   <td valign="top">Milestone:</td>
diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl
index 2198066b8..f1d6aa429 100644
--- a/template/en/default/admin/products/confirm-delete.html.tmpl
+++ b/template/en/default/admin/products/confirm-delete.html.tmpl
@@ -26,8 +26,8 @@
 
 <table border="1" cellpadding="4" cellspacing="0">
   <tr bgcolor="#6666FF">
-    <th valign="top" align="left">Field</th>
-    <th valign="top" align="left">Value</th>
+    <th valign="top" class="left">Field</th>
+    <th valign="top" class="left">Value</th>
   </tr>
 
   [% IF Param('useclassification') %]
diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl
index 80f6417a3..abc0e5775 100644
--- a/template/en/default/admin/table.html.tmpl
+++ b/template/en/default/admin/table.html.tmpl
@@ -71,7 +71,7 @@
   <tr bgcolor="#6666FF">
     [% FOREACH c = columns %]
       [%# Default to align left for headers %]
-      <th align="[% (c.align || 'left') FILTER html %]">
+      <th style="text-align:[% (c.align || 'left') FILTER html %];">
         [% c.heading FILTER html %]
       </th>
     [% END %]
diff --git a/template/en/default/admin/versions/confirm-delete.html.tmpl b/template/en/default/admin/versions/confirm-delete.html.tmpl
index e6f39226f..85c297647 100644
--- a/template/en/default/admin/versions/confirm-delete.html.tmpl
+++ b/template/en/default/admin/versions/confirm-delete.html.tmpl
@@ -23,8 +23,8 @@
 
 <table border="1" cellpadding="4" cellspacing="0">
 <tr bgcolor="#6666FF">
-  <th valign="top" align="left">Field</th>
-  <th valign="top" align="left">Value</th>
+  <th valign="top" class="left">Field</th>
+  <th valign="top" class="left">Value</th>
 </tr>
 <tr>
   <td valign="top">Version:</td>
diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl
index 4557af616..9eaaa7b28 100644
--- a/template/en/default/attachment/confirm-delete.html.tmpl
+++ b/template/en/default/attachment/confirm-delete.html.tmpl
@@ -22,8 +22,8 @@
 
 <table border="1" cellpadding="4" cellspacing="0">
   <tr bgcolor="#6666FF">
-    <th valign="top" align="left">Field</th>
-    <th valign="top" align="left">Value</th>
+    <th valign="top" class="left">Field</th>
+    <th valign="top" class="left">Value</th>
   </tr>
   <tr>
     <td valign="top">Attachment ID:</td>
diff --git a/template/en/default/attachment/diff-file.html.tmpl b/template/en/default/attachment/diff-file.html.tmpl
index 815b6de1b..2c87188ad 100644
--- a/template/en/default/attachment/diff-file.html.tmpl
+++ b/template/en/default/attachment/diff-file.html.tmpl
@@ -41,7 +41,7 @@ incremental_restore()
   [% section_num = section_num + 1 %]
   <tr><th colspan="4" class="section_head">
     <table id="[% file.filename FILTER html %]_sec[% section_num %]" cellpadding="0" cellspacing="0">
-    <tr><th width="95%" align="left">
+    <tr><th width="95%" class="left">
   [% IF file.is_add %]
     Added
   [% ELSIF file.is_remove %]
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index e30492c36..9c9247980 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -44,7 +44,7 @@ function toggle_display(link) {
 <br>
 <table id="attachment_table" cellspacing="0" cellpadding="4">
   <tr id="a0">
-    <th colspan="[% show_attachment_flags ? 3 : 2 %]" align="left">
+    <th colspan="[% show_attachment_flags ? 3 : 2 %]" class="left">
       Attachments
     </th>
   </tr>
diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index 7bbe29c8c..30de0f9fd 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -37,7 +37,7 @@
 [% FOREACH c = classifications %]
   [% IF c.object %]
     <tr>
-      <th colspan="2" align="left">[% c.object.name FILTER html %]:
+      <th colspan="2" class="left">[% c.object.name FILTER html %]:
       [%+ c.object.description FILTER html_light %]</th>
     </tr>
   [% END %]

From 03d9ddff2cca46b7ea0cefc2714dceff719e3c8a Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Fri, 30 Aug 2013 18:49:53 +1000
Subject: [PATCH 193/240] Bug 388653 - Stars in chart.html.tmpl could be
 thought as typos r=simon, a=glob

---
 template/en/default/reports/chart.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/reports/chart.html.tmpl b/template/en/default/reports/chart.html.tmpl
index ab334639c..3276f31e0 100644
--- a/template/en/default/reports/chart.html.tmpl
+++ b/template/en/default/reports/chart.html.tmpl
@@ -36,7 +36,7 @@
     <a href="[% sizeurl %]&amp;width=[% width %]&amp;height=
              [% height + 100 %]">Taller</a><br>
     <a href="[% sizeurl %]&amp;width=[% width - 100 %]&amp;height=
-             [% height %]">Thinner</a> * 
+             [% height %]">Thinner</a> | 
     <a href="[% sizeurl %]&amp;width=[% width + 100 %]&amp;height=
              [% height %]">Fatter</a>&nbsp;&nbsp;&nbsp;&nbsp;<br>
     <a href="[% sizeurl %]&amp;width=[% width %]&amp;height=

From 564b55a7cd12ee73c522d7a9e35c12105867be4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 2 Sep 2013 02:35:18 +0200
Subject: [PATCH 194/240] Fix bustage on Oracle due to bug 898830

---
 Bugzilla/Attachment.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 7e758c874..251363c35 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -684,13 +684,13 @@ sub get_attachments_by_bug {
 
         # Preload datasizes.
         my $sizes =
-          $dbh->selectall_hashref('SELECT attach_id, LENGTH(thedata) AS size
+          $dbh->selectall_hashref('SELECT attach_id, LENGTH(thedata) AS datasize
                                    FROM attachments LEFT JOIN attach_data ON attach_id = id
                                    WHERE bug_id = ?',
                                    'attach_id', undef, $bug->id);
 
         # Force the size of attachments not in the DB to be recalculated.
-        $_->{datasize} = $sizes->{$_->id}->{size} || undef foreach @$attachments;
+        $_->{datasize} = $sizes->{$_->id}->{datasize} || undef foreach @$attachments;
     }
     return $attachments;
 }

From c6792bb003429d65ab404e42549e766adaab0b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 3 Sep 2013 11:40:27 +0200
Subject: [PATCH 195/240] Bug 848063: [Oracle] importxml.pl fails with
 ORA-01830: comment timestamps are not correctly formatted r=LpSolit a=sgreen

---
 importxml.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/importxml.pl b/importxml.pl
index 4e78f093f..53b0e34fa 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -482,7 +482,7 @@ sub process_bug {
     foreach my $comment ( $bug->children('long_desc') ) {
         Debug( "Parsing Long Description", DEBUG_LEVEL );
         my %long_desc = ( who       => $comment->field('who'),
-                          bug_when  => $comment->field('bug_when'),
+                          bug_when  => format_time($comment->field('bug_when'), '%Y-%m-%d %T'),
                           isprivate => $comment->{'att'}->{'isprivate'} || 0 );
 
         # If the exporter is not in the insidergroup, keep the comment public.

From 91ee085e164b9b64882dbe2ae2a3c5850ce3c62e Mon Sep 17 00:00:00 2001
From: Damien Nozay <damien.nozay@gmail.com>
Date: Tue, 3 Sep 2013 11:50:11 +0200
Subject: [PATCH 196/240] Bug 911513: 007util.t fails due to a missing
 dependency to DateTime r=LpSolit a=sgreen

---
 t/007util.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/t/007util.t b/t/007util.t
index a73f4dfa7..495102ffa 100644
--- a/t/007util.t
+++ b/t/007util.t
@@ -12,6 +12,7 @@
 use lib 't';
 use Support::Files;
 use Test::More tests => 17;
+use DateTime;
 
 BEGIN { 
     use_ok(Bugzilla);

From cb13f44ee0f6af2a48fd61d3a173ccbd3566c0f9 Mon Sep 17 00:00:00 2001
From: Damien Nozay <damien.nozay@gmail.com>
Date: Tue, 3 Sep 2013 11:54:00 +0200
Subject: [PATCH 197/240] Bug 911512: Bugzilla::DB::Oracle lacks POD coverage
 r=LpSolit a=sgreen

---
 Bugzilla/DB/Oracle.pm | 66 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index 68aa3fa93..23474fe15 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -787,3 +787,69 @@ sub fetch {
    return $row;
 }
 1;
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item adjust_statement
+
+=item bz_check_regexp
+
+=item bz_drop_table
+
+=item bz_explain
+
+=item bz_last_key
+
+=item bz_setup_database
+
+=item bz_table_columns_real
+
+=item bz_table_list_real
+
+=item do
+
+=item prepare
+
+=item prepare_cached
+
+=item quote_identifier
+
+=item selectall_arrayref
+
+=item selectall_hashref
+
+=item selectcol_arrayref
+
+=item selectrow_array
+
+=item selectrow_arrayref
+
+=item selectrow_hashref
+
+=item sql_date_format
+
+=item sql_date_math
+
+=item sql_from_days
+
+=item sql_fulltext_search
+
+=item sql_group_concat
+
+=item sql_in
+
+=item sql_limit
+
+=item sql_not_regexp
+
+=item sql_position
+
+=item sql_regexp
+
+=item sql_string_concat
+
+=item sql_to_days
+
+=back

From 6f3005379a4dbea100ae3542d900881d344919a3 Mon Sep 17 00:00:00 2001
From: Pami Ketolainen <pami.ketolainen@jollamobile.com>
Date: Tue, 3 Sep 2013 11:57:13 +0200
Subject: [PATCH 198/240] Bug 901589: The 'isempty' operator does not work for
 custom multiselect fields r/a=glob

---
 Bugzilla/Search.pm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 557acec74..18b2a3107 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -3007,6 +3007,15 @@ sub _multiselect_isempty {
         };
         return "tag_$chart_id.id IS $not NULL";
     }
+    elsif ($self->_multi_select_fields->{$field}) {
+        push @$joins, {
+            table => "bug_$field",
+            as => "bug_${field}_$chart_id",
+            from  => 'bug_id',
+            to    => 'bug_id',
+        };
+        return "bug_${field}_$chart_id.bug_id IS $not NULL";
+    }
 }
 
 ###############################

From 5bc772626b7263121ef188d138f6738878cddb3a Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 4 Sep 2013 09:57:17 +1000
Subject: [PATCH 199/240] Bug 331529 - editusers list should let me search for
 disabled users r=simon, a=simon

---
 editusers.cgi                                    |  9 +++++----
 template/en/default/admin/users/search.html.tmpl | 10 +++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/editusers.cgi b/editusers.cgi
index e12fc35b6..f4e3c0841 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -68,7 +68,7 @@ if ($action eq 'search') {
     my $matchstr      = trim($cgi->param('matchstr'));
     my $matchtype     = $cgi->param('matchtype');
     my $grouprestrict = $cgi->param('grouprestrict') || '0';
-    my $enabled_only  = $cgi->param('enabled_only') || '0';
+    my $is_enabled    = scalar $cgi->param('is_enabled');
     my $query = 'SELECT DISTINCT userid, login_name, realname, is_enabled, ' .
                 $dbh->sql_date_format('last_seen_date', '%Y-%m-%d') . ' AS last_seen_date ' .
                 'FROM profiles';
@@ -160,11 +160,12 @@ if ($action eq 'search') {
             $query .= " $nextCondition ugm.group_id IN($grouplist) ";
         }
 
-        if ($enabled_only eq '1') {
-            $query .= " $nextCondition profiles.is_enabled = 1 ";
+        detaint_natural($is_enabled);
+        if ($is_enabled == 0 || $is_enabled == 1) {
+            $query .= " $nextCondition profiles.is_enabled = ?";
             $nextCondition = 'AND';
+            push(@bindValues, $is_enabled);
         }
-
         $query .= ' ORDER BY profiles.login_name';
 
         $vars->{'users'} = $dbh->selectall_arrayref($query,
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index c66af4c5c..55b7300a6 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -56,9 +56,13 @@
 [% END %]
 
 <p>
-  <input type="checkbox" name="enabled_only" value="1" id="enabled_only"
-         checked="checked">
-  <label for="enabled_only">Enabled user accounts only</label>
+  Restrict search to
+  <select name="is_enabled">
+      <option value="2">All</option>
+      <option value="1" selected>Enabled</option>
+      <option value="0">Disabled</option>
+  </select>
+  users.
 </p>
 
 [% Hook.process('end') %]

From 48935ad16abf029401925d328f798ed08390da73 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Wed, 4 Sep 2013 10:00:50 +1000
Subject: [PATCH 200/240] Bug 606509 - Text badly aligned for "deadline" and
 "bug numbered" in the search page r=simon, a=simon

---
 skins/standard/search_form.css            |  4 ++++
 template/en/default/search/form.html.tmpl | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/skins/standard/search_form.css b/skins/standard/search_form.css
index ff97dbcbc..0381730af 100644
--- a/skins/standard/search_form.css
+++ b/skins/standard/search_form.css
@@ -91,6 +91,10 @@
   text-align: right;
 }
 
+.field_label_sup {
+  font-weight: normal;
+}
+
 #summary_field.search_field_row {
   width: inherit;
 }
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 26bf7f06e..fcb038638 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -170,11 +170,13 @@ TUI_hide_default('information_query');
            value="[% default.bug_id.0 FILTER html %]" size="20">
            <div class="field_help">(comma-separated list)</div>
     </div>
-    should be 
-    <select name="bug_id_type" id="bug_id_type">
-      <option value="anyexact"[% " selected" IF default.bug_id_type.0 == "anyexact" %]>only included in</option>
-      <option value="nowords"[% " selected" IF default.bug_id_type.0 == "nowords" %]>excluded from</option>
-    </select> the results
+    <span class="field_label field_label_sup">
+      should be 
+      <select name="bug_id_type" id="bug_id_type">
+        <option value="anyexact"[% " selected" IF default.bug_id_type.0 == "anyexact" %]>only included in</option>
+        <option value="nowords"[% " selected" IF default.bug_id_type.0 == "nowords" %]>excluded from</option>
+      </select> the results
+    </span>
   </div>
 
   [% Hook.process('after_freetext_fields') %]

From 50a5c07fd20993252fdb675d63503f1709bc0963 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Wed, 4 Sep 2013 10:41:14 +1000
Subject: [PATCH 201/240] Bug 875217 - SecurityError in Javascript on
 buglist.cgi r=glob, a=glob

---
 template/en/default/list/list.html.tmpl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 6e1755fed..ec453d0b7 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -30,22 +30,22 @@
 [% qorder = order FILTER uri IF order %]
 
 [% javascript =  BLOCK %]
-  [% new_url = cgi.self_url %]
   [% IF quicksearch %]
-    [% new_url = BLOCK ~%]
-      buglist.cgi?quicksearch=[% quicksearch FILTER uri %]
+    [% new_param = BLOCK ~%]
+      quicksearch=[% quicksearch FILTER uri %]
       [%~ IF cgi.param('list_id') ~%]
         &list_id=[% cgi.param('list_id') FILTER uri %]
       [%~ END %]
     [% END %]
   [% ELSIF cgi.param('token') != '' %]
-    [% new_url = 'buglist.cgi?'
-                 _ cgi.canonicalise_query('token', 'cmdtype', 'remtype') %]
+    [% new_param = cgi.canonicalise_query('token', 'cmdtype', 'remtype') %]
+  [% ELSE %]
+    [% new_param = cgi.canonicalise_query %]
   [% END %]
 
   if (history && history.replaceState) {
     history.replaceState(null, "[% unfiltered_title FILTER js %]",
-                         "[% new_url FILTER js %]");
+                         "buglist.cgi?[% new_param FILTER js %]");
     document.title = "[% unfiltered_title FILTER js %]";
   }
   [% javascript FILTER none %]

From b99ef1f46fd0ec82bae64b6eed5728274c2ceed1 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Wed, 4 Sep 2013 10:47:40 +1000
Subject: [PATCH 202/240] Bug 909720 - Remove unused code in Bugzilla::Search
 r=glob, a=glob

---
 Bugzilla/Search.pm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 18b2a3107..89231e7a8 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -2875,11 +2875,6 @@ sub _multiselect_table {
         return "attachments INNER JOIN attach_data "
                . " ON attachments.attach_id = attach_data.id"
     }
-    elsif ($field eq 'flagtypes.name') {
-        $args->{full_field} = $dbh->sql_string_concat("flagtypes.name",
-                                                      "flags.status");
-        return "flags INNER JOIN flagtypes ON flags.type_id = flagtypes.id";
-    }
     my $table = "bug_$field";
     $args->{full_field} = "bug_$field.value";
     return $table;

From 243701885deacafd9d8f3656bcde5342fa81ce66 Mon Sep 17 00:00:00 2001
From: Edmund Wong <ewong@pw-wspx.org>
Date: Thu, 5 Sep 2013 13:22:44 +0200
Subject: [PATCH 203/240] Bug 801284: whine.pl should use DEFAULT_COLUMN_LIST
 as the default column list instead of its hardcoded list r=LpSolit a=sgreen

---
 whine.pl | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/whine.pl b/whine.pl
index f7ed6d5c7..d8cc39174 100755
--- a/whine.pl
+++ b/whine.pl
@@ -422,16 +422,8 @@ sub run_queries {
         next unless $savedquery;    # silently ignore missing queries
 
         # Execute the saved query
-        my @searchfields = qw(
-            bug_id
-            bug_severity
-            priority
-            rep_platform
-            assigned_to
-            bug_status
-            resolution
-            short_desc
-        );
+        my @searchfields = ('bug_id', DEFAULT_COLUMN_LIST);
+
         # A new Bugzilla::CGI object needs to be created to allow
         # Bugzilla::Search to execute a saved query.  It's exceedingly weird,
         # but that's how it works.

From e1a077eda24b834b13771baab611b22588dc6804 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Mon, 9 Sep 2013 13:22:31 -0400
Subject: [PATCH 204/240] Bug 914196 - Documentation for User.login should
 state cookies not used for JSONRPC and REST when making future connections
 r/a=glob

---
 Bugzilla/WebService/User.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index ba8640f3d..22306a11f 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -466,7 +466,9 @@ user that was logged in, and a C<token> which can be passed in
 the parameters as authentication in other calls. A set of http cookies
 is also sent with the response. These cookies *or* the token can be sent
 along with any future requests to the webservice, for the duration of the
-session.
+session. Note that cookies are not accepted for GET requests for JSONRPC
+and REST for security reasons. You may, however, use the token or valid
+login parameters for those requests.
 
 =item B<Errors>
 

From b1ec592f05ce64a7d88644f8c774f8a8d86724ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 10 Sep 2013 23:09:18 +0200
Subject: [PATCH 205/240] Bug 914262: KHTML-based browsers such as Konqueror do
 not support the Server-Push technology r=dkl a=sgreen

---
 buglist.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buglist.cgi b/buglist.cgi
index 9bce1c74a..00d67c599 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -105,7 +105,7 @@ my $serverpush =
     && exists $ENV{'HTTP_USER_AGENT'} 
       && $ENV{'HTTP_USER_AGENT'} =~ /(Mozilla.[3-9]|Opera)/
         && $ENV{'HTTP_USER_AGENT'} !~ /compatible/i
-          && $ENV{'HTTP_USER_AGENT'} !~ /(?:WebKit|Trident)/
+          && $ENV{'HTTP_USER_AGENT'} !~ /(?:WebKit|Trident|KHTML)/
             && !defined($cgi->param('serverpush'))
               || $cgi->param('serverpush');
 

From 4d4929bdd9e6eae25f7a47c897b35f30fc4b59e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 12 Sep 2013 19:00:07 +0200
Subject: [PATCH 206/240] Bug 911509: SOAP::Lite 1.0 no longer includes
 XMLRPC::Lite r=dkl a=glob

---
 Bugzilla/Install/Requirements.pm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 0d02904e9..ce6b2bc78 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -272,6 +272,8 @@ sub OPTIONAL_MODULES {
         version => 0,
         feature => ['auth_radius'],
     },
+    # XXX - Once we require XMLRPC::Lite 0.717 or higher, we can
+    # remove SOAP::Lite from the list.
     {
         package => 'SOAP-Lite',
         module  => 'SOAP::Lite',
@@ -280,6 +282,14 @@ sub OPTIONAL_MODULES {
         version => '0.712',
         feature => ['xmlrpc'],
     },
+    # Since SOAP::Lite 1.0, XMLRPC::Lite is no longer included
+    # and so it must be checked separately.
+    {
+        package => 'XMLRPC-Lite',
+        module  => 'XMLRPC::Lite',
+        version => '0.712',
+        feature => ['xmlrpc'],
+    },
     {
         package => 'JSON-RPC',
         module  => 'JSON::RPC',

From a859a5caeb18efb80be8a99e526611132bda63d3 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Fri, 13 Sep 2013 09:39:43 +1000
Subject: [PATCH 207/240] Bug 914986 - Create Bug.update_attachment to update
 attachments via RPC/REST r=dkl, a=sgreen

---
 Bugzilla/Attachment.pm                        |   9 +-
 Bugzilla/WebService/Bug.pm                    | 231 ++++++++++++++++++
 .../WebService/Server/REST/Resources/Bug.pm   |   6 +
 3 files changed, 242 insertions(+), 4 deletions(-)

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 251363c35..92e05e606 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -900,10 +900,11 @@ sub update {
     }
 
     if (scalar(keys %$changes)) {
-      $dbh->do('UPDATE attachments SET modification_time = ? WHERE attach_id = ?',
-               undef, ($timestamp, $self->id));
-      $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
-               undef, ($timestamp, $self->bug_id));
+        $dbh->do('UPDATE attachments SET modification_time = ? WHERE attach_id = ?',
+                 undef, ($timestamp, $self->id));
+        $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
+                 undef, ($timestamp, $self->bug_id));
+        $self->{modification_time} = $timestamp;
     }
 
     return $changes;
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 5be07b7a3..334ac0e8e 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -735,6 +735,87 @@ sub add_attachment {
     return { ids => \@created_ids };
 }
 
+sub update_attachment {
+    my ($self, $params) = validate(@_, 'ids');
+
+    my $user = Bugzilla->login(LOGIN_REQUIRED);
+    my $dbh = Bugzilla->dbh;
+
+    my $ids = delete $params->{ids};
+    defined $ids || ThrowCodeError('param_required', { param => 'ids' });
+
+    # Some fields cannot be sent to set_all
+    foreach my $key (qw(login password token)) {
+        delete $params->{$key};
+    }
+
+    # We can't update flags, and summary is really description
+    delete $params->{flags};
+    if (exists $params->{summary}) {
+        $params->{description} = delete $params->{summary};
+    }
+
+    # Get all the attachments, after verifying that they exist and are editable
+    my @attachments = ();
+    my %bugs = ();
+    foreach my $id (@$ids) {
+        my $attachment = Bugzilla::Attachment->new($id)
+          || ThrowUserError("invalid_attach_id", { attach_id => $id });
+        my $bug = $attachment->bug;
+        $attachment->_check_bug;
+        $attachment->validate_can_edit($bug->product_id)
+          || ThrowUserError("illegal_attachment_edit", { attach_id => $id });
+
+        push @attachments, $attachment;
+        $bugs{$bug->id} = $bug;
+    }
+
+    # Update the values
+    foreach my $attachment (@attachments) {
+        $attachment->set_all($params);
+    }
+
+    $dbh->bz_start_transaction();
+
+    # Do the actual update and get information to return to user
+    my @result;
+    foreach my $attachment (@attachments) {
+        my $changes = $attachment->update();
+
+        my %hash = (
+            id               => $self->type('int', $attachment->id),
+            last_change_time => $self->type('dateTime', $attachment->modification_time),
+            changes          => {},
+        );
+
+        foreach my $field (keys %$changes) {
+            my $change = $changes->{$field};
+            # Description is shown as summary to the user
+            $field = 'summary' if $field eq 'description';
+
+            # We normalize undef to an empty string, so that the API
+            # stays consistent for things like Deadline that can become
+            # empty.
+            $hash{changes}->{$field} = {
+                removed => $self->type('string', $change->[0] // ''),
+                added   => $self->type('string', $change->[1] // '')
+            };
+        }
+
+        push(@result, \%hash);
+    }
+
+    $dbh->bz_commit_transaction();
+
+    # Email users about the change
+    foreach my $bug (values %bugs) {
+        Bugzilla::BugMail::Send($bug->id, { 'changer' => $user });
+    }
+
+    # Return the information to the user
+    return { attachments => \@result };
+}
+
 sub add_comment {
     my ($self, $params) = @_;
 
@@ -2945,6 +3026,156 @@ You set the "data" field to an empty string.
 =back
 
 
+=head2 update_attachment
+
+B<UNSTABLE>
+
+=over
+
+=item B<Description>
+
+This allows you to update attachment metadata in Bugzilla.
+
+=item B<REST>
+
+To update attachment metadata on a current attachment:
+
+PUT /bug/attachment/<attach_id>
+
+The params to include in the POST body, as well as the returned
+data format are the same as below. The C<ids> param will be
+overridden as it it pulled from the URL path.
+
+=item B<Params>
+
+=over
+
+=item C<ids>
+
+B<Required> C<array> An array of integers -- the ids of the attachments you
+want to update.
+
+=item C<file_name>
+
+C<string> The "file name" that will be displayed
+in the UI for this attachment.
+
+=item C<summary>
+
+C<string> A short string describing the
+attachment.
+
+=item C<content_type>
+
+C<string> The MIME type of the attachment, like
+C<text/plain> or C<image/png>.
+
+=item C<is_patch>
+
+C<boolean> True if Bugzilla should treat this attachment as a patch.
+If you specify this, you do not need to specify a C<content_type>.
+The C<content_type> of the attachment will be forced to C<text/plain>.
+
+=item C<is_private>
+
+C<boolean> True if the attachment should be private (restricted
+to the "insidergroup"), False if the attachment should be public.
+
+=item C<is_obsolete>
+
+C<boolean> True if the attachment is obsolete, False otherwise.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field, "attachment". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the attachment that was updated.
+
+=item C<last_change_time>
+
+C<dateTime> The exact time that this update was done at, for this attachment.
+If no update was done (that is, no fields had their values changed and
+no comment was added) then this will instead be the last time the attachment
+was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this bug. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added> (C<string>) The values that were added to this field.
+possibly a comma-and-space-separated list if multiple values were added.
+
+=item C<removed> (C<string>) The values that were removed from this
+field.
+
+=back
+
+=back
+
+Here's an example of what a return value might look like:
+
+ {
+   attachments => [
+     {
+       id    => 123,
+       last_change_time => '2010-01-01T12:34:56',
+       changes => {
+         summary => {
+           removed => 'Sample ptach',
+           added   => 'Sample patch'
+         },
+         is_obsolete => {
+           removed => '0',
+           added   => '1',
+         }
+       },
+     }
+   ]
+ }
+
+=item B<Errors>
+
+This method can throw all the same errors as L</get>, plus:
+
+=over
+
+=item 601 (Invalid MIME Type)
+
+You specified a C<content_type> argument that was blank, not a valid
+MIME type, or not a MIME type that Bugzilla accepts for attachments.
+
+=item 603 (File Name Not Specified)
+
+You did not specify a valid for the C<file_name> argument.
+
+=item 604 (Summary Required)
+
+You did not specify a value for the C<summary> argument.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+
 =head2 add_comment
 
 B<STABLE>
diff --git a/Bugzilla/WebService/Server/REST/Resources/Bug.pm b/Bugzilla/WebService/Server/REST/Resources/Bug.pm
index a82625be7..98ae6049c 100644
--- a/Bugzilla/WebService/Server/REST/Resources/Bug.pm
+++ b/Bugzilla/WebService/Server/REST/Resources/Bug.pm
@@ -94,6 +94,12 @@ sub _rest_resources {
                 params => sub {
                     return { attachment_ids => [ $_[0] ] };
                 }
+            },
+            PUT => {
+                method => 'update_attachment',
+                params => sub {
+                    return { ids => [ $_[0] ] };
+                }
             }
         },
         qr{^/field/bug$}, {

From c95d4f7eb3f25b6df03a8f2904027b321ed1e613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 16 Sep 2013 17:04:45 +0200
Subject: [PATCH 208/240] Bug 785565: Search by change history between two
 dates doesn't give expected result r/a=glob

---
 Bugzilla/Search.pm | 49 +++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 89231e7a8..a7600f449 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -1515,6 +1515,8 @@ sub _special_parse_chfield {
 
     @fields = map { $_ eq '[Bug creation]' ? 'creation_ts' : $_ } @fields;
 
+    return undef unless ($date_from ne '' || $date_to ne '' || $value_to ne '');
+
     my $clause = new Bugzilla::Search::Clause();
 
     # It is always safe and useful to push delta_ts into the charts
@@ -1536,44 +1538,21 @@ sub _special_parse_chfield {
         $clause->add('delta_ts', 'lessthaneq', $date_to);
     }
 
-    # Basically, we construct the chart like:
-    #
-    # (added_for_field1 = value OR added_for_field2 = value)
-    # AND (date_field1_changed >= date_from OR date_field2_changed >= date_from)
-    # AND (date_field1_changed <= date_to OR date_field2_changed <= date_to)
-    #
-    # Theoretically, all we *really* would need to do is look for the field id
-    # in the bugs_activity table, because we've already limited the search
-    # by delta_ts above, but there's no chart to do that, so we check the
-    # change date of the fields.
-    
-    if ($value_to ne '') {
-        my $value_clause = new Bugzilla::Search::Clause('OR');
-        foreach my $field (@fields) {
-            $value_clause->add($field, 'changedto', $value_to);
-        }
-        $clause->add($value_clause);
-    }
+    # chfieldto is supposed to be a relative date or a date of the form
+    # YYYY-MM-DD, i.e. without the time appended to it. We append the
+    # time ourselves so that the end date is correctly taken into account.
+    $date_to .= ' 23:59:59' if $date_to =~ /^\d{4}-\d{1,2}-\d{1,2}$/;
 
-    if ($date_from ne '') {
-        my $from_clause = new Bugzilla::Search::Clause('OR');
-        foreach my $field (@fields) {
-            $from_clause->add($field, 'changedafter', $date_from);
-        }
-        $clause->add($from_clause);
-    }
-    if ($date_to ne '') {
-        # chfieldto is supposed to be a relative date or a date of the form
-        # YYYY-MM-DD, i.e. without the time appended to it. We append the
-        # time ourselves so that the end date is correctly taken into account.
-        $date_to .= ' 23:59:59' if $date_to =~ /^\d{4}-\d{1,2}-\d{1,2}$/;
+    my $join_clause = new Bugzilla::Search::Clause('OR');
 
-        my $to_clause = new Bugzilla::Search::Clause('OR');
-        foreach my $field (@fields) {
-            $to_clause->add($field, 'changedbefore', $date_to);
-        }
-        $clause->add($to_clause);
+    foreach my $field (@fields) {
+        my $sub_clause = new Bugzilla::Search::ClauseGroup();
+        $sub_clause->add(condition($field, 'changedto', $value_to)) if $value_to ne '';
+        $sub_clause->add(condition($field, 'changedafter', $date_from)) if $date_from ne '';
+        $sub_clause->add(condition($field, 'changedbefore', $date_to)) if $date_to ne '';
+        $join_clause->add($sub_clause);
     }
+    $clause->add($join_clause);
 
     return @{$clause->children} ? $clause : undef;
 }

From 970ae6a6150a82793cb40889c034f1be7c77710d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Mon, 16 Sep 2013 23:48:42 +0200
Subject: [PATCH 209/240] Fix POD (bogus in bug 866927)

---
 Bugzilla/WebService/Bug.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 334ac0e8e..fd8ea8fef 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -2256,13 +2256,11 @@ You do not have access to the bug_id you specified.
 
 =over
 
-=item C<permissive> argument added to this method's params in Bugzilla B<3.4>. 
+=item C<permissive> argument added to this method's params in Bugzilla B<3.4>.
 
 =item The following properties were added to this method's return values
 in Bugzilla B<3.4>:
 
-=item REST API call added in Bugzilla B<5.0>
-
 =over
 
 =item For C<bugs>
@@ -2306,6 +2304,8 @@ and all custom fields.
 =item The C<actual_time> item was added to the C<bugs> return value
 in Bugzilla B<4.4>.
 
+=item REST API call added in Bugzilla B<5.0>.
+
 =back
 
 =back

From 921af271a8d5575e421abd25c1e0bae0f655db6c Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 17 Sep 2013 10:48:36 -0400
Subject: [PATCH 210/240] Bug 916935 - Add Access-Control-Allow-Headers to REST
 API to indicate which HTTP headers can be used when making the request
 r/a=glob

---
 Bugzilla/WebService/Server/REST.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Bugzilla/WebService/Server/REST.pm b/Bugzilla/WebService/Server/REST.pm
index 4145455ec..2216911c9 100644
--- a/Bugzilla/WebService/Server/REST.pm
+++ b/Bugzilla/WebService/Server/REST.pm
@@ -124,6 +124,7 @@ sub response {
 
     # Access Control
     $response->header("Access-Control-Allow-Origin", "*");
+    $response->header("Access-Control-Allow-Headers", "origin, content-type, accept");
 
     # ETag support
     my $etag = $self->bz_etag;

From cbbf47fca53a9b840ebcbf6b01e332221d8e0039 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 18 Sep 2013 15:59:09 +0800
Subject: [PATCH 211/240] Bug 877545: quicksearch shouldn't treat apostrophes
 as quote characters r=simon, a=glob

---
 Bugzilla/Search/Quicksearch.pm | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 3048de237..c7dfaeb8f 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -138,7 +138,7 @@ sub quicksearch {
 
         # Retain backslashes and quotes, to know which strings are quoted,
         # and which ones are not.
-        my @words = parse_line('\s+', 1, $searchstring);
+        my @words = _parse_line('\s+', 1, $searchstring);
         # If parse_line() returns no data, this means strings are badly quoted.
         # Rather than trying to guess what the user wanted to do, we throw an error.
         scalar(@words)
@@ -194,7 +194,7 @@ sub quicksearch {
 
         # Loop over all main-level QuickSearch words.
         foreach my $qsword (@qswords) {
-            my @or_operand = parse_line('\|', 1, $qsword);
+            my @or_operand = _parse_line('\|', 1, $qsword);
             foreach my $term (@or_operand) {
                 my $negate = substr($term, 0, 1) eq '-';
                 if ($negate) {
@@ -208,7 +208,7 @@ sub quicksearch {
                 # Having ruled out the special cases, we may now split
                 # by comma, which is another legal boolean OR indicator.
                 # Remove quotes from quoted words, if any.
-                @words = parse_line(',', 0, $term);
+                @words = _parse_line(',', 0, $term);
                 foreach my $word (@words) {
                     if (!_special_field_syntax($word, $negate)) {
                         _default_quicksearch_word($word, $negate);
@@ -260,6 +260,27 @@ sub quicksearch {
 # Parts of quicksearch() #
 ##########################
 
+sub _parse_line {
+    my ($delim, $keep, $line) = @_;
+    # parse_line always treats ' as a quote character, making it impossible
+    # to sanely search for contradictions. As this behavour isn't
+    # configurable, we replace ' with a placeholder to hide it from the
+    # parser.
+
+    # only treat ' at the start or end of words as quotes
+    # it's easier to do this in reverse with regexes
+    $line =~ s/(^|\s|:)'/$1\001/g;
+    $line =~ s/'($|\s)/\001$1/g;
+    $line =~ s/\\?'/\000/g;
+    $line =~ tr/\001/'/;
+
+    my @words = parse_line($delim, $keep, $line);
+    foreach my $word (@words) {
+        $word =~ tr/\000/'/;
+    }
+    return @words;
+}
+
 sub _bug_numbers_only {
     my $searchstring = shift;
     my $cgi = Bugzilla->cgi;
@@ -365,10 +386,10 @@ sub _handle_field_names {
 
     # Generic field1,field2,field3:value1,value2 notation.
     # We have to correctly ignore commas and colons in quotes.
-    my @field_values = parse_line(':', 1, $or_operand);
+    my @field_values = _parse_line(':', 1, $or_operand);
     if (scalar @field_values == 2) {
-        my @fields = parse_line(',', 1, $field_values[0]);
-        my @values = parse_line(',', 1, $field_values[1]);
+        my @fields = _parse_line(',', 1, $field_values[0]);
+        my @values = _parse_line(',', 1, $field_values[1]);
         foreach my $field (@fields) {
             my $translated = _translate_field_name($field);
             # Skip and record any unknown fields

From 36fb04b839476aab9fbed7eefd928a62888641cb Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 18 Sep 2013 16:03:21 +0800
Subject: [PATCH 212/240] fix typo in comment

---
 Bugzilla/Search/Quicksearch.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index c7dfaeb8f..8bd5029a7 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -263,7 +263,7 @@ sub quicksearch {
 sub _parse_line {
     my ($delim, $keep, $line) = @_;
     # parse_line always treats ' as a quote character, making it impossible
-    # to sanely search for contradictions. As this behavour isn't
+    # to sanely search for contractions. As this behavour isn't
     # configurable, we replace ' with a placeholder to hide it from the
     # parser.
 

From 8d55c64c94eb4920e450b10bb052ee2bb66c4bf8 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 18 Sep 2013 11:08:32 -0400
Subject: [PATCH 213/240] Bug 916979 - Bug.search ignores the "limit" parameter
 a/r=glob

---
 Bugzilla/Bug.pm            |  4 ----
 Bugzilla/WebService/Bug.pm | 12 ++++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 302b58595..ba941788b 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -270,10 +270,6 @@ use constant FIELD_MAP => {
     summary          => 'short_desc',
     url              => 'bug_file_loc',
     whiteboard       => 'status_whiteboard',
-
-    # These are special values for the WebService Bug.search method.
-    limit            => 'LIMIT',
-    offset           => 'OFFSET',
 };
 
 use constant REQUIRED_FIELD_MAP => {
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index fd8ea8fef..14d56713c 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -493,19 +493,19 @@ sub search {
     }
 
     my %match_params = %{ $params };
-    delete $params->{include_fields};
-    delete $params->{exclude_fields};
+    delete $match_params{include_fields};
+    delete $match_params{exclude_fields};
 
     # If no other parameters have been passed other than limit and offset
     # then we throw error if system is configured to do so.
-    if (!grep(!/^(limit|offset)$/i, keys %$params)
+    if (!grep(!/^(limit|offset)$/, keys %match_params)
         && !Bugzilla->params->{search_allow_no_criteria})
     {
         ThrowUserError('buglist_parameters_required');
     }
 
-    $options{order_columns} = [ split(/\s*,\s*/, delete $params->{order}) ] if $params->{order};
-    $options{params} = $params;
+    $options{order_columns} = [ split(/\s*,\s*/, delete $match_params{order}) ] if $match_params{order};
+    $options{params} = \%match_params;
 
     my $search = new Bugzilla::Search(%options);
     my ($data) = $search->data;
@@ -518,7 +518,7 @@ sub search {
     my @bug_ids = map { $_->[0] } @$data;
     my $bug_objects = Bugzilla::Bug->new_from_list(\@bug_ids);
 
-    my @bugs = map { $self->_bug_to_hash($_, \%match_params) } @$bug_objects;
+    my @bugs = map { $self->_bug_to_hash($_, $params) } @$bug_objects;
 
     return { bugs => \@bugs };
 }

From 576f71b862634da8a15a327fc452c2421ff37966 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 18 Sep 2013 11:57:56 -0400
Subject: [PATCH 214/240] Bug 578434 - Bug group checkboxes lay out poorly
 beside attachment field r/a=glob

---
 skins/standard/global.css                  | 25 +++++---
 skins/standard/show_bug.css                |  4 --
 template/en/default/bug/comments.html.tmpl | 40 ++++++------
 template/en/default/bug/edit.html.tmpl     | 75 +++++++++++++---------
 4 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/skins/standard/global.css b/skins/standard/global.css
index 51d7c29db..5b1aa532e 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -286,7 +286,7 @@ div#docslinks {
 }
 
 .bz_comment_text {
-     width: 50em;
+     max-width: 60em;
 }
 
 .bz_comment_user, .bz_comment_time, .bz_comment_number, 
@@ -299,14 +299,6 @@ div#docslinks {
     float: right;
 }
 
-.bz_collapse_expand_comments {
-    padding: 0;
-    margin: 0 0 0 1em;
-    list-style-type: none;
-}
-.bz_collapse_expand_comments li {
-    margin-bottom: .5em;
-}
 .bz_collapse_comment {
     text-decoration: none;
 }
@@ -555,6 +547,19 @@ input.required, select.required, span.required_explanation {
     margin-left: -1px;
 }
 
+#bz_big_form_parts #left {
+    float: left;
+    min-width: 55em;
+    margin-right: 1em;
+    margin-bottom: 1em;
+}
+
+#bz_big_form_parts #right {
+    float: left;
+    width: auto;
+    max-width: 35em;
+}
+
 /*******************/
 /* Form Validation */
 /*******************/
@@ -575,4 +580,4 @@ form th {
 }
 th.left {
     text-align: left;
-}
\ No newline at end of file
+}
diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css
index b776b60bc..fe2e6abb3 100644
--- a/skins/standard/show_bug.css
+++ b/skins/standard/show_bug.css
@@ -66,10 +66,6 @@ table#flags {
     vertical-align: top;
 }
 
-.bz_group_visibility_section {
-    margin-left: 1em;
-}
-
 .bz_group_visibility_section .instructions {
     font-style: italic;
 }
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 61d1c67e0..2ea0c3c4c 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -55,11 +55,28 @@
     [% sort_order = "oldest_to_newest" %]
 [% END %]
 
-<!-- This auto-sizes the comments and positions the collapse/expand links 
-     to the right. -->
-<table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
+<!-- This auto-sizes the comments and positions the collapse/expand links
+     above the coments. -->
+<table class="bz_comment_table" cellpadding="0" cellspacing="0">
+[% IF mode == "edit" %]
+  <tr>
+    <td>
+      <div class="bz_collapse_expand_comments">
+        <a href="#" onclick="toggle_all_comments('collapse');
+                             return false;">Collapse All Comments</a> |
+        <a href="#" onclick="toggle_all_comments('expand');
+                             return false;">Expand All Comments</a>
+        [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
+          | <span class="bz_add_comment"><a href="#"
+                  onclick="return goto_add_comments('bug_status_bottom');">
+                  Add Comment</a></span>
+        [% END %]
+      </div>
+    </td>
+  </tr>
+[% END %]
+<tr>
 <td>
-
 [% FOREACH comment = comments %]
   [% IF comment.count >= start_at %]
     [% PROCESS a_comment %]
@@ -80,21 +97,6 @@
   #%]  
 [% Hook.process("aftercomments") %]
 
-</td>
-<td>
-  [% IF mode == "edit" %]
-    <ul class="bz_collapse_expand_comments">
-      <li><a href="#" onclick="toggle_all_comments('collapse'); 
-                               return false;">Collapse All Comments</a></li>
-      <li><a href="#" onclick="toggle_all_comments('expand');
-                               return false;">Expand All Comments</a></li>
-      [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
-        <li class="bz_add_comment"><a href="#" 
-            onclick="return goto_add_comments('bug_status_bottom');">
-            Add Comment</a></li>
-      [% END %]                               
-    </ul>
-  [% END %]
 </td>
 </tr></table>
 
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 683d6ed4a..9af8ee627 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -119,43 +119,54 @@
     </tr>
   </table>
 
-  <table id="bz_big_form_parts" cellspacing="0" cellpadding="0"><tr>
-  <td>
-    [% IF user.is_timetracker %]
-      [% PROCESS section_timetracking %]
-    [% END %]
+  <div id="bz_big_form_parts">
+    <div id="left">
+      [% IF user.is_timetracker %]
+        <div id="timetracking">
+          [% PROCESS section_timetracking %]
+        </div>
+      [% END %]
 
-    [%# *** Attachments *** %]
+      <div id="attachments">
+        [%# *** Attachments *** %]
 
-    [% PROCESS attachment/list.html.tmpl
-               attachments = bug.attachments
-               bugid       = bug.bug_id
-               num_attachment_flag_types = bug.num_attachment_flag_types
-               show_attachment_flags = bug.show_attachment_flags
-    %]
+        [% PROCESS attachment/list.html.tmpl
+                   attachments = bug.attachments
+                   bugid       = bug.bug_id
+                   num_attachment_flag_types = bug.num_attachment_flag_types
+                   show_attachment_flags = bug.show_attachment_flags
+        %]
+      </div>
 
-    [% IF user.settings.comment_box_position.value == 'before_comments' %]
-      [% PROCESS comment_box %]
-    [% END %]
-  </td>
-  <td>
-    [% PROCESS section_restrict_visibility %]
-  </td>
-  </tr></table>
+      [% IF user.settings.comment_box_position.value == 'before_comments' %]
+        <div id="comment_box">
+          [% PROCESS comment_box %]
+        </div>
+      [% END %]
 
-  [%# *** Additional Comments *** %]
-  <div id="comments">
-    [% PROCESS bug/comments.html.tmpl
-      comments = bug.comments
-      mode = user.id ? "edit" : "show"
-    %]
+      [%# *** Additional Comments *** %]
+      <div id="comments">
+        [% PROCESS bug/comments.html.tmpl
+                   comments = bug.comments
+                   mode = user.id ? "edit" : "show"
+        %]
+      </div>
+
+      [% IF user.settings.comment_box_position.value == 'after_comments' %]
+        <div id="comment_box">
+          [% PROCESS comment_box %]
+        </div>
+      [% END %]
+    </div>
+
+    <div id="right">
+      <div id="restrict_visibility">
+        [% PROCESS section_restrict_visibility %]
+      </div>
+    </div>
+
+    <div style="clear:both;"></div>
   </div>
-
-  [% IF user.settings.comment_box_position.value == 'after_comments' %]
-    <hr>
-    [% PROCESS comment_box %]
-  [% END %]        
-
 </form>
 
 [%############################################################################%]

From 031c17dc6e2d68dba64f1d3cffc99e7f5b0c6996 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Wed, 18 Sep 2013 12:50:41 -0400
Subject: [PATCH 215/240] Bug 578434 - Bug group checkboxes lay out poorly
 beside attachment field - Backed out to make adjustments on screen size
 before the groups drop down

---
 skins/standard/global.css                  | 25 +++-----
 skins/standard/show_bug.css                |  4 ++
 template/en/default/bug/comments.html.tmpl | 40 ++++++------
 template/en/default/bug/edit.html.tmpl     | 75 +++++++++-------------
 4 files changed, 65 insertions(+), 79 deletions(-)

diff --git a/skins/standard/global.css b/skins/standard/global.css
index 5b1aa532e..51d7c29db 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -286,7 +286,7 @@ div#docslinks {
 }
 
 .bz_comment_text {
-     max-width: 60em;
+     width: 50em;
 }
 
 .bz_comment_user, .bz_comment_time, .bz_comment_number, 
@@ -299,6 +299,14 @@ div#docslinks {
     float: right;
 }
 
+.bz_collapse_expand_comments {
+    padding: 0;
+    margin: 0 0 0 1em;
+    list-style-type: none;
+}
+.bz_collapse_expand_comments li {
+    margin-bottom: .5em;
+}
 .bz_collapse_comment {
     text-decoration: none;
 }
@@ -547,19 +555,6 @@ input.required, select.required, span.required_explanation {
     margin-left: -1px;
 }
 
-#bz_big_form_parts #left {
-    float: left;
-    min-width: 55em;
-    margin-right: 1em;
-    margin-bottom: 1em;
-}
-
-#bz_big_form_parts #right {
-    float: left;
-    width: auto;
-    max-width: 35em;
-}
-
 /*******************/
 /* Form Validation */
 /*******************/
@@ -580,4 +575,4 @@ form th {
 }
 th.left {
     text-align: left;
-}
+}
\ No newline at end of file
diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css
index fe2e6abb3..b776b60bc 100644
--- a/skins/standard/show_bug.css
+++ b/skins/standard/show_bug.css
@@ -66,6 +66,10 @@ table#flags {
     vertical-align: top;
 }
 
+.bz_group_visibility_section {
+    margin-left: 1em;
+}
+
 .bz_group_visibility_section .instructions {
     font-style: italic;
 }
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 2ea0c3c4c..61d1c67e0 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -55,28 +55,11 @@
     [% sort_order = "oldest_to_newest" %]
 [% END %]
 
-<!-- This auto-sizes the comments and positions the collapse/expand links
-     above the coments. -->
-<table class="bz_comment_table" cellpadding="0" cellspacing="0">
-[% IF mode == "edit" %]
-  <tr>
-    <td>
-      <div class="bz_collapse_expand_comments">
-        <a href="#" onclick="toggle_all_comments('collapse');
-                             return false;">Collapse All Comments</a> |
-        <a href="#" onclick="toggle_all_comments('expand');
-                             return false;">Expand All Comments</a>
-        [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
-          | <span class="bz_add_comment"><a href="#"
-                  onclick="return goto_add_comments('bug_status_bottom');">
-                  Add Comment</a></span>
-        [% END %]
-      </div>
-    </td>
-  </tr>
-[% END %]
-<tr>
+<!-- This auto-sizes the comments and positions the collapse/expand links 
+     to the right. -->
+<table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
 <td>
+
 [% FOREACH comment = comments %]
   [% IF comment.count >= start_at %]
     [% PROCESS a_comment %]
@@ -97,6 +80,21 @@
   #%]  
 [% Hook.process("aftercomments") %]
 
+</td>
+<td>
+  [% IF mode == "edit" %]
+    <ul class="bz_collapse_expand_comments">
+      <li><a href="#" onclick="toggle_all_comments('collapse'); 
+                               return false;">Collapse All Comments</a></li>
+      <li><a href="#" onclick="toggle_all_comments('expand');
+                               return false;">Expand All Comments</a></li>
+      [% IF user.settings.comment_box_position.value == "after_comments" && user.id %]
+        <li class="bz_add_comment"><a href="#" 
+            onclick="return goto_add_comments('bug_status_bottom');">
+            Add Comment</a></li>
+      [% END %]                               
+    </ul>
+  [% END %]
 </td>
 </tr></table>
 
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 9af8ee627..683d6ed4a 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -119,54 +119,43 @@
     </tr>
   </table>
 
-  <div id="bz_big_form_parts">
-    <div id="left">
-      [% IF user.is_timetracker %]
-        <div id="timetracking">
-          [% PROCESS section_timetracking %]
-        </div>
-      [% END %]
+  <table id="bz_big_form_parts" cellspacing="0" cellpadding="0"><tr>
+  <td>
+    [% IF user.is_timetracker %]
+      [% PROCESS section_timetracking %]
+    [% END %]
 
-      <div id="attachments">
-        [%# *** Attachments *** %]
+    [%# *** Attachments *** %]
 
-        [% PROCESS attachment/list.html.tmpl
-                   attachments = bug.attachments
-                   bugid       = bug.bug_id
-                   num_attachment_flag_types = bug.num_attachment_flag_types
-                   show_attachment_flags = bug.show_attachment_flags
-        %]
-      </div>
+    [% PROCESS attachment/list.html.tmpl
+               attachments = bug.attachments
+               bugid       = bug.bug_id
+               num_attachment_flag_types = bug.num_attachment_flag_types
+               show_attachment_flags = bug.show_attachment_flags
+    %]
 
-      [% IF user.settings.comment_box_position.value == 'before_comments' %]
-        <div id="comment_box">
-          [% PROCESS comment_box %]
-        </div>
-      [% END %]
+    [% IF user.settings.comment_box_position.value == 'before_comments' %]
+      [% PROCESS comment_box %]
+    [% END %]
+  </td>
+  <td>
+    [% PROCESS section_restrict_visibility %]
+  </td>
+  </tr></table>
 
-      [%# *** Additional Comments *** %]
-      <div id="comments">
-        [% PROCESS bug/comments.html.tmpl
-                   comments = bug.comments
-                   mode = user.id ? "edit" : "show"
-        %]
-      </div>
-
-      [% IF user.settings.comment_box_position.value == 'after_comments' %]
-        <div id="comment_box">
-          [% PROCESS comment_box %]
-        </div>
-      [% END %]
-    </div>
-
-    <div id="right">
-      <div id="restrict_visibility">
-        [% PROCESS section_restrict_visibility %]
-      </div>
-    </div>
-
-    <div style="clear:both;"></div>
+  [%# *** Additional Comments *** %]
+  <div id="comments">
+    [% PROCESS bug/comments.html.tmpl
+      comments = bug.comments
+      mode = user.id ? "edit" : "show"
+    %]
   </div>
+
+  [% IF user.settings.comment_box_position.value == 'after_comments' %]
+    <hr>
+    [% PROCESS comment_box %]
+  [% END %]        
+
 </form>
 
 [%############################################################################%]

From d10c1a804e205e5b07461d9bd6f5956248aace7d Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 19 Sep 2013 12:58:30 +1000
Subject: [PATCH 216/240] Bug 332034 - Add New Attachment as an option for
 attachment.cgi when we are not passed any parameters\nr=simon, a=glob

---
 template/en/default/attachment/choose.html.tmpl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/template/en/default/attachment/choose.html.tmpl b/template/en/default/attachment/choose.html.tmpl
index c6b94d792..9a82d7c86 100644
--- a/template/en/default/attachment/choose.html.tmpl
+++ b/template/en/default/attachment/choose.html.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 [% PROCESS global/header.html.tmpl
-   title = "Locate attachment",
+   title = "Locate or Create Attachment",
    onload = "document.forms['choose-id'].id.focus()"
  %]
 
@@ -20,10 +20,16 @@
 </form>
 
 <form method="get" action="show_bug.cgi">
-  <p>Or, access it from the list of attachments in its associated [% terms.bug %] report:</p>
+  <p>Or, Access it from the list of attachments in its associated [% terms.bug %] report:</p>
   <p>[% terms.Bug %] ID: <input name="id" size="6">
   <input type="submit" name="action" value="View" id="action">
   </p>
 </form>
 
+<form method="get" action="attachment.cgi">
+  <p>Or, Create a new attachment by entering its [% terms.bug %] Id below:</p>
+  <p>[% terms.Bug %] ID: <input name="bugid" size="6">
+    <button name="action" value="enter" id="action">New Attachment</button>
+  </p>
+</form>
 [% PROCESS global/footer.html.tmpl %]

From 866891054a9c45d464f914d0043e2ce51d9f2756 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 19 Sep 2013 13:01:05 +1000
Subject: [PATCH 217/240] Bug 365501 - admin/products/groupcontrol/updated uses
 p as br r=simon, a=glob

---
 .../products/groupcontrol/updated.html.tmpl   | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/template/en/default/admin/products/groupcontrol/updated.html.tmpl b/template/en/default/admin/products/groupcontrol/updated.html.tmpl
index 5ee066c86..1294754fb 100644
--- a/template/en/default/admin/products/groupcontrol/updated.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/updated.html.tmpl
@@ -18,24 +18,36 @@
 [% PROCESS global/header.html.tmpl
   title = title
 %]
-<p>
+
 [% IF changes._group_controls.now_na.size %]
   [% FOREACH g = changes._group_controls.now_na %]
-    Removing [% terms.bugs %] from group '[% g.name FILTER html %]' which
-    no longer applies to this product<p>
-    [% g.bug_count FILTER html %] [%+ terms.bugs %] removed<p>
+    <p>
+    Removing [% terms.bugs %] from group '[% g.name FILTER html %]' which is
+    no longer applicable to this product.<br>
+    [% IF g.bug_count == 1 %]
+      One [% terms.bug %] removed.
+    [% ELSE %]
+      [% g.bug_count FILTER html %] [%+ terms.bugs %] removed.
+    [% END %]
+    </p>
   [% END %]
 [% END %]
 
 [% IF changes._group_controls.now_mandatory.size %]
   [% FOREACH g = changes._group_controls.now_mandatory %]
+    <p>
     Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is 
-    mandatory for this product<p>
-    [% g.bug_count FILTER html %] [%+ terms.bugs %] added<p>
+    now mandatory for this product.<br>
+    [% IF g.bug_count == 1 %]
+      One [% terms.bug %] added.
+    [% ELSE %]
+      [% g.bug_count FILTER html %] [%+ terms.bugs %] added.
+    [% END %]
+    </p>
   [% END %]
 [% END %]
 
-Group control updates done<p>
+<p>Group control updated.</p>
 
 [% PROCESS admin/products/footer.html.tmpl %]
 

From 9c2e2977c7b9fb84dfcaf0442c0198c36b53dc74 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 19 Sep 2013 13:03:52 +1000
Subject: [PATCH 218/240] Bug 368541 - Make it obvious that the bug alias is
 not part of the bug summary r=simon, a=simon

---
 template/en/default/bug/edit.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 683d6ed4a..8f1a2031b 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -168,11 +168,11 @@
       [% PROCESS commit_button id="_top"%]
      <a href="show_bug.cgi?id=[% bug.bug_id %]">
         [%-# %]<b>[% terms.Bug %]&nbsp;[% bug.bug_id FILTER html %]</b>
-     [%-# %]</a> -<span id="summary_alias_container" class="bz_default_hidden"> 
+     [%-# %]</a> <span id="summary_alias_container" class="bz_default_hidden"> 
       [% IF bug.alias != "" %]
         (<span id="alias_nonedit_display">[% bug.alias FILTER html %]</span>) 
       [% END %]
-      <span id="short_desc_nonedit_display">[% bug.short_desc FILTER quoteUrls(bug) %]</span>
+      - <span id="short_desc_nonedit_display">[% bug.short_desc FILTER quoteUrls(bug) %]</span>
       [% IF bug.check_can_change_field('short_desc', 0, 1) || 
             bug.check_can_change_field('alias', 0, 1)  %]
         <small class="editme">(<a href="#" id="editme_action">edit</a>)</small>

From 9100d68cf6e5f742b6c996a06fc14e3ad8a53336 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 19 Sep 2013 13:07:06 +1000
Subject: [PATCH 219/240] Bug 373820 - View User Account Log should include
 real name r=simon, a=glob

---
 template/en/default/account/profile-activity.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/en/default/account/profile-activity.html.tmpl b/template/en/default/account/profile-activity.html.tmpl
index 3f8030a0e..b8a58d596 100644
--- a/template/en/default/account/profile-activity.html.tmpl
+++ b/template/en/default/account/profile-activity.html.tmpl
@@ -22,7 +22,7 @@
   #%]
 
 [% title = BLOCK %]
-  Account History for '[% otheruser.login FILTER html %]'
+  Account History for '[% otheruser.identity FILTER html %]'
 [% END %]
 
 

From 0ff231337f13be7f4da1b5cc5de0ec4f1acb2779 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 19 Sep 2013 13:10:00 +1000
Subject: [PATCH 220/240] Bug 897510 - Create and Modify User Screen must also
 contain password rules as hint r=simon, a=glob

---
 template/en/default/admin/users/userdata.html.tmpl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index e42ee6438..4df8032a5 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -65,7 +65,7 @@
   # if we ever have a login system that can create accounts through
   # createaccount.cgi but can't change passwords.
   #%]
-  
+  [% password_complexity = Param('password_complexity') %]
 [% IF editusers %]
   [% IF user.authorizer.can_change_password %]
   <tr>
@@ -73,6 +73,13 @@
     <td>
       <input type="password" size="16" name="password" id="password"
              value="" autocomplete="off" />
+      [% IF password_complexity == "mixed_letters" %] 
+        (Password must contain at least one UPPER and one lowercase letter.)
+      [% ELSIF password_complexity == "letters_numbers" %] 
+        (Password must contain at least one UPPER and one lower case letter and a number.)
+      [% ELSIF password_complexity == "letters_numbers_specialchars" %] 
+        (Password must contain at least one letter, a number and a special character.)
+      [% END %]
       [% IF editform %]<br />
         (Enter new password to change.)
       [% END %]

From d6657a8539df7e6ffe44d0b9dd71001373a08a2d Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 20 Sep 2013 10:20:52 -0400
Subject: [PATCH 221/240] Bug 918362 - The "order" parameter passed to
 Bug.search is ignored r=LpSolit,a=glob

---
 Bugzilla/WebService/Bug.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 14d56713c..eaca97f91 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -504,7 +504,7 @@ sub search {
         ThrowUserError('buglist_parameters_required');
     }
 
-    $options{order_columns} = [ split(/\s*,\s*/, delete $match_params{order}) ] if $match_params{order};
+    $options{order}  = [ split(/\s*,\s*/, delete $match_params{order}) ] if $match_params{order};
     $options{params} = \%match_params;
 
     my $search = new Bugzilla::Search(%options);
@@ -516,9 +516,9 @@ sub search {
 
     # Search.pm won't return bugs that the user shouldn't see so no filtering is needed.
     my @bug_ids = map { $_->[0] } @$data;
-    my $bug_objects = Bugzilla::Bug->new_from_list(\@bug_ids);
-
-    my @bugs = map { $self->_bug_to_hash($_, $params) } @$bug_objects;
+    my %bug_objects = map { $_->id => $_ } @{ Bugzilla::Bug->new_from_list(\@bug_ids) };
+    my @bugs = map { $bug_objects{$_} } @bug_ids;
+    @bugs = map { $self->_bug_to_hash($_, $params) } @bugs;
 
     return { bugs => \@bugs };
 }

From 3ff16324200c8b8438fdaf63f20df55d84d6b3c3 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 23 Sep 2013 22:34:57 +0800
Subject: [PATCH 222/240] Bug 918647: "Use of uninitialized value" warnings
 when using quicksearch r=simon, a=glob

---
 Bugzilla/Search/Quicksearch.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 8bd5029a7..c07c8ba03 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -196,6 +196,7 @@ sub quicksearch {
         foreach my $qsword (@qswords) {
             my @or_operand = _parse_line('\|', 1, $qsword);
             foreach my $term (@or_operand) {
+                next unless defined $term;
                 my $negate = substr($term, 0, 1) eq '-';
                 if ($negate) {
                     $term = substr($term, 1);
@@ -262,6 +263,8 @@ sub quicksearch {
 
 sub _parse_line {
     my ($delim, $keep, $line) = @_;
+    return () unless defined $line;
+
     # parse_line always treats ' as a quote character, making it impossible
     # to sanely search for contractions. As this behavour isn't
     # configurable, we replace ' with a placeholder to hide it from the
@@ -276,7 +279,7 @@ sub _parse_line {
 
     my @words = parse_line($delim, $keep, $line);
     foreach my $word (@words) {
-        $word =~ tr/\000/'/;
+        $word =~ tr/\000/'/ if defined $word;
     }
     return @words;
 }
@@ -348,6 +351,7 @@ sub _handle_status_and_resolution {
 
 sub _handle_special_first_chars {
     my ($qsword, $negate) = @_;
+    return 0 if !defined $qsword || length($qsword) <= 1;
 
     my $firstChar = substr($qsword, 0, 1);
     my $baseWord = substr($qsword, 1);

From 098de82e3edf44d1b996a01aa546da138ca4ac9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Netolick=C3=BD?= <netolish@netolish.cz>
Date: Mon, 23 Sep 2013 17:41:26 +0200
Subject: [PATCH 223/240] Bug 919475: [Oracle] Crash when non-mandatory free
 text custom fields are left empty on bug creation r=LpSolit a=justdave

---
 Bugzilla/DB/Schema/Oracle.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm
index 1bed5b5ca..1554a0fe1 100644
--- a/Bugzilla/DB/Schema/Oracle.pm
+++ b/Bugzilla/DB/Schema/Oracle.pm
@@ -205,6 +205,10 @@ sub get_add_column_ddl {
     }
     else {
         @sql = $self->SUPER::get_add_column_ddl(@_);
+        # Create triggers to deal with empty string. 
+        if ($definition->{TYPE} =~ /varchar|TEXT/i && $definition->{NOTNULL}) {
+            push(@sql, _get_notnull_trigger_ddl($table, $column));
+        }
     }
 
     return @sql;

From 7126c5e110113e2f2f474844643c5b1945cbc35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 24 Sep 2013 11:29:49 +0200
Subject: [PATCH 224/240] Temporary fix for bug 916882: whitelist product and
 component when used with the changed* operators r/a=glob

---
 Bugzilla/Search/ClauseGroup.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Search/ClauseGroup.pm b/Bugzilla/Search/ClauseGroup.pm
index a50dc4fb3..eb306525c 100644
--- a/Bugzilla/Search/ClauseGroup.pm
+++ b/Bugzilla/Search/ClauseGroup.pm
@@ -66,7 +66,10 @@ sub add {
 
     # Unsupported fields
     if (grep { $_ eq $field } UNSUPPORTED_FIELDS ) {
-        ThrowUserError('search_grouped_field_invalid', { field => $field });
+        # XXX - Hack till bug 916882 is fixed.
+        my $operator = scalar(@args) == 3 ? $args[1] : $args[0]->{operator};
+        ThrowUserError('search_grouped_field_invalid', { field => $field })
+          unless (($field eq 'product' || $field eq 'component') && $operator =~ /^changed/);
     }
 
     $self->SUPER::add(@args);

From 310097648638c1bb91f92d7b671de8723fbc1629 Mon Sep 17 00:00:00 2001
From: Dirk Steinmetz <rsjtdrjgfuzkfg@abwesend.de>
Date: Wed, 25 Sep 2013 19:47:55 +0200
Subject: [PATCH 225/240] Bug 455301: Don't show password box on userprefs.cgi
 if your auth method didn't use DB passwords r=LpSolit a=justdave

---
 .../default/account/prefs/account.html.tmpl   | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl
index a00b5df97..b6c1ce1f8 100644
--- a/template/en/default/account/prefs/account.html.tmpl
+++ b/template/en/default/account/prefs/account.html.tmpl
@@ -13,21 +13,25 @@
   #%]
 
 <table>
-  <tr>
-    <td colspan="3">
-      Please enter your existing password to confirm account changes.
-    </td>
-  </tr>
-  <tr>
-    <th>Password:</th>
-    <td>
-      <input type="hidden" name="old_login" value="[% user.login FILTER html %]">
-      <input type="password" name="old_password">
-    </td>
-  </tr>              
-  <tr>
-    <td colspan="2"><hr></td>
-  </tr>
+  [% IF user.authorizer.can_change_password
+        || (user.authorizer.can_change_email && Param('allowemailchange')) %]
+    <tr>
+      <td colspan="3">
+        Please enter your existing password to confirm account changes.
+      </td>
+    </tr>
+    <tr>
+      <th>Password:</th>
+      <td>
+        <input type="hidden" name="old_login" value="[% user.login FILTER html %]">
+        <input type="password" name="old_password">
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2"><hr></td>
+    </tr>
+  [% END %]
+
   [% IF user.authorizer.can_change_password %]
     <tr>
       <th>New password:</th>

From d0b1b50b9dc535f5716c52ec821e6ff171d6358d Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 26 Sep 2013 12:02:01 +1000
Subject: [PATCH 226/240] Bug 621216 - Don't call GetQuip() if the user doesn't
 want quips r=simon, a=simon

---
 buglist.cgi | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/buglist.cgi b/buglist.cgi
index 00d67c599..eda2e988d 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -905,7 +905,10 @@ if (scalar(@bugowners) > 1 && $user->in_group('editbugs')) {
 # the list more compact.
 $vars->{'splitheader'} = $cgi->cookie('SPLITHEADER') ? 1 : 0;
 
-$vars->{'quip'} = GetQuip();
+if ($user->settings->{'display_quips'}->{'value'} eq 'on') {
+    $vars->{'quip'} = GetQuip();
+}
+
 $vars->{'currenttime'} = localtime(time());
 
 # See if there's only one product in all the results (or only one product

From 88e2beb3b0ac08d95da6199a02516c2595a15949 Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Thu, 26 Sep 2013 12:04:59 +1000
Subject: [PATCH 227/240] Bug 714523 - editversions.cgi should use ->set_all
 r=simon, a=simon

---
 Bugzilla/Version.pm | 10 +++++-----
 editversions.cgi    |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Bugzilla/Version.pm b/Bugzilla/Version.pm
index 920853ecd..317b73d95 100644
--- a/Bugzilla/Version.pm
+++ b/Bugzilla/Version.pm
@@ -169,8 +169,8 @@ sub product {
 # Validators
 ################################
 
-sub set_name      { $_[0]->set('value', $_[1]);    }
-sub set_is_active { $_[0]->set('isactive', $_[1]); }
+sub set_value    { $_[0]->set('value', $_[1]);    }
+sub set_isactive { $_[0]->set('isactive', $_[1]); }
 
 sub _check_value {
     my ($invocant, $name, undef, $params) = @_;
@@ -219,7 +219,7 @@ Bugzilla::Version - Bugzilla product version class.
     my $version = Bugzilla::Version->create(
         { value => $name, product => $product_obj });
 
-    $version->set_name($new_name);
+    $version->set_value($new_name);
     $version->update();
 
     $version->remove_from_db;
@@ -255,9 +255,9 @@ below.
 
 =item DEFAULT_VERSION
 
-=item set_is_active
+=item set_isactive
 
-=item set_name
+=item set_value
 
 =item product_id
 
diff --git a/editversions.cgi b/editversions.cgi
index 1d056c67b..06f2f580c 100755
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -188,8 +188,10 @@ if ($action eq 'update') {
 
     $dbh->bz_start_transaction();
 
-    $version->set_name($version_name);
-    $version->set_is_active($isactive);
+    $version->set_all({
+        value    =>  $version_name,
+        isactive =>  $isactive
+    });
     my $changes = $version->update();
 
     $dbh->bz_commit_transaction();

From 0558c8b8cf96a93567e33ea80e01b3da48037a68 Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Thu, 26 Sep 2013 12:13:18 +1000
Subject: [PATCH 228/240] Bug 769134 - Bugzilla unintentionally removes groups
 when changing products with multiple bugs r=dkl, a=justdave

---
 Bugzilla/Bug.pm                               |  4 ++
 .../bug/process/verify-new-product.html.tmpl  | 71 +++++++++++++++----
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index ba941788b..4d2421a59 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -2556,6 +2556,10 @@ sub _set_product {
                                        OR gcm.othercontrol != ?) )',
                 undef, (@idlist, $product->id, CONTROLMAPNA, CONTROLMAPNA));
             $vars{'old_groups'} = Bugzilla::Group->new_from_list($gids);            
+
+            # Did we come here from editing multiple bugs? (affects how we
+            # show optional group changes)
+            $vars{multiple_bugs} = Bugzilla->cgi->param('id') ? 0 : 1;
         }
         
         if (%vars) {
diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index 77471cbcd..c712ae09a 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -140,19 +140,64 @@
   [% IF optional_groups.size %]
     <p>These groups are optional. You can decide to restrict [% terms.bugs %] to
     one or more of the following groups:<br>
-    [% FOREACH group = optional_groups %]
-      <input type="hidden" name="defined_groups"
-             value="[% group.group.name FILTER html %]">
-      <input type="checkbox" id="group_[% group.group.id FILTER html %]"
-             name="groups"
-             [% ' checked="checked"' IF ((group.membercontrol == constants.CONTROLMAPDEFAULT && user.in_group(group.group.name))
-                 || (group.othercontrol == constants.CONTROLMAPDEFAULT && !user.in_group(group.group.name))
-                 || cgi.param("groups").contains(group.group.name)) %]
-             value="[% group.group.name FILTER html %]">
-      <label for="group_[% group.group.id FILTER html %]">
-        [% group.group.name FILTER html %]: [% group.group.description FILTER html %]
-      </label>
-      <br>
+    [% IF multiple_bugs %]
+      [% USE Bugzilla %]
+      <script type="text/javascript">
+        function turn_off(myself, id) {
+            var other_checkbox = document.getElementById(id);
+            if (myself.checked && other_checkbox) {
+                other_checkbox.checked = false;
+            }
+        }
+      </script>
+
+      <table border="1">
+        <tr>
+          <th>Remove<br>[% terms.bugs %]<br>from this<br>group</th>
+          <th>Add<br>[% terms.bugs %]<br>to this<br>group</th>
+          <th>Group Name:</th>
+        </tr>
+
+        [% FOREACH group = optional_groups %]
+        <tr>
+          <td align="center">
+            <input type="checkbox" name="defined_groups" 
+                   id="defined_group_[% group.group.id FILTER html %]"
+                   value="[% group.group.name FILTER html %]"
+                   [% IF Bugzilla.cgi.param("defined_groups").contains(group.group.name) %] checked="checked"[% END %]
+                   onchange="turn_off(this, 'group_[% group.group.id FILTER html %]')">
+          </td>
+          <td align="center">
+            <input type="checkbox" name="groups" 
+                   id="group_[% group.group.id FILTER html %]"
+                   value="[% group.group.name FILTER html %]"
+                   [% IF Bugzilla.cgi.param("groups").contains(group.group.name) %] checked="checked"[% END %]
+                   onchange="turn_off(this, 'defined_group_[% group.group.id FILTER html %]')">
+          </td>
+
+          <td>
+            [% group.group.description FILTER html %]
+          </td>
+
+        </tr>
+        [% END %]
+
+      </table>
+    [% ELSE %]
+      [% FOREACH group = optional_groups %]
+        <input type="hidden" name="defined_groups"
+               value="[% group.group.name FILTER html %]">
+        <input type="checkbox" id="group_[% group.group.id FILTER html %]"
+               name="groups"
+               [% ' checked="checked"' IF ((group.membercontrol == constants.CONTROLMAPDEFAULT && user.in_group(group.group.name))
+                   || (group.othercontrol == constants.CONTROLMAPDEFAULT && !user.in_group(group.group.name))
+                   || cgi.param("groups").contains(group.group.name)) %]
+               value="[% group.group.name FILTER html %]">
+        <label for="group_[% group.group.id FILTER html %]">
+          [% group.group.name FILTER html %]: [% group.group.description FILTER html %]
+        </label>
+        <br>
+      [% END %]
     [% END %]
     </p>
   [% END %]

From a19fa51ed96b0ccbf176703fb22c1492198340fb Mon Sep 17 00:00:00 2001
From: Simon Green <sgreen@redhat.com>
Date: Thu, 26 Sep 2013 12:20:02 +1000
Subject: [PATCH 229/240] Bug 893589 - 004template.t fails when templates in
 extension directory r=dkl, a=simon

---
 t/004template.t        | 16 ++++++++++------
 t/Support/Files.pm     |  8 ++++----
 t/Support/Templates.pm | 16 ++++++++++++----
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/t/004template.t b/t/004template.t
index c81bccc45..298bb52c0 100644
--- a/t/004template.t
+++ b/t/004template.t
@@ -37,17 +37,21 @@ my $fh;
 }
 
 # Check to make sure all templates that are referenced in Bugzilla
-# exist in the proper place in the English template directory.
+# exist in the proper place in the English template or extension directory.
 # All other languages may or may not include any template as Bugzilla will
 # fall back to English if necessary.
 
 foreach my $file (@referenced_files) {
-    my $path = File::Spec->catfile($english_default_include_path, $file);
-    if (-e $path) {
-        ok(1, "$path exists");
-    } else {
-        ok(0, "$path cannot be located --ERROR");
+    my $found = 0;
+    foreach my $path (@english_default_include_paths) {
+        my $pathfile = File::Spec->catfile($path, $file);
+        if (-e $pathfile) {
+            $found = 1;
+            last;
+        }
     }
+
+    ok($found, "$file found");
 }
 
 foreach my $include_path (@include_paths) {
diff --git a/t/Support/Files.pm b/t/Support/Files.pm
index ed011a374..330a473b1 100644
--- a/t/Support/Files.pm
+++ b/t/Support/Files.pm
@@ -16,11 +16,11 @@ use File::Find;
 find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, 'Bugzilla');
 push(@files, 'extensions/create.pl');
 
-my @extensions = glob('extensions/*');
-foreach my $extension (@extensions) {
-    # Skip disabled extensions
-    next if -e "$extension/disabled";
+@extensions =
+    grep { $_ ne 'extensions/create.pl' && ! -e "$_/disabled" }
+    glob('extensions/*');
 
+foreach my $extension (@extensions) {
     find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, $extension);
 }
 
diff --git a/t/Support/Templates.pm b/t/Support/Templates.pm
index c9a528e9f..2185d687f 100644
--- a/t/Support/Templates.pm
+++ b/t/Support/Templates.pm
@@ -12,9 +12,9 @@ use strict;
 use lib 't';
 use parent qw(Exporter);
 @Support::Templates::EXPORT = 
-         qw(@languages @include_paths $english_default_include_path
+         qw(@languages @include_paths @english_default_include_paths
          %include_path @referenced_files %actual_files $num_actual_files);
-use vars qw(@languages @include_paths $english_default_include_path
+use vars qw(@languages @include_paths @english_default_include_paths
             %include_path @referenced_files %actual_files $num_actual_files);
 
 use Bugzilla;
@@ -34,10 +34,18 @@ use File::Spec;
 # All include paths
 @include_paths = ();
 
-# English default include path
-$english_default_include_path =
+# English default include paths
+push @english_default_include_paths,
     File::Spec->catdir(bz_locations()->{'templatedir'}, 'en', 'default');
 
+# And the extensions too
+foreach my $extension (@Support::Files::extensions) {
+    my $dir = File::Spec->catdir($extension, 'template', 'en', 'default');
+    if (-e $dir) {
+        push @english_default_include_paths, $dir;
+    }
+}
+
 # Files which are referenced in the cgi files
 @referenced_files = ();
 

From e2db84768e2d10324000d2857cc85b3f853d492a Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Thu, 26 Sep 2013 11:06:28 -0400
Subject: [PATCH 230/240] Bug 917669 - invalid or expired authentication tokens
 and cookies should throw errors, not be silently ignored r/a=glob

---
 Bugzilla/Auth/Login/Cookie.pm                 | 21 ++++++++++++-------
 Bugzilla/Template.pm                          |  5 +----
 Bugzilla/Util.pm                              | 17 +++++++++++++--
 Bugzilla/WebService.pm                        |  7 +++++++
 .../en/default/global/user-error.html.tmpl    |  5 +++++
 5 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm
index 130fab8e3..3068331ea 100644
--- a/Bugzilla/Auth/Login/Cookie.pm
+++ b/Bugzilla/Auth/Login/Cookie.pm
@@ -14,6 +14,7 @@ use parent qw(Bugzilla::Auth::Login);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;
+use Bugzilla::Error;
 
 use List::Util qw(first);
 
@@ -73,7 +74,9 @@ sub get_login_info {
                                         AND (ipaddr = ? OR ipaddr IS NULL)',
                                  undef, ($login_cookie, $user_id, $ip_addr));
 
-        # If the cookie is valid, return a valid username.
+        # If the cookie or token is valid, return a valid username.
+        # If they were not valid and we are using a webservice, then
+        # throw an error notifying the client.
         if ($is_valid) {
             # If we logged in successfully, then update the lastused 
             # time on the login cookie
@@ -81,12 +84,16 @@ sub get_login_info {
                        WHERE cookie = ?", undef, $login_cookie);
             return { user_id => $user_id };
         }
+        elsif (i_am_webservice()) {
+            ThrowUserError('invalid_cookies_or_token');
+        }
     }
 
-    # Either the he cookie is invalid, or we got no cookie. We don't want 
-    # to ever return AUTH_LOGINFAILED, because we don't want Bugzilla to 
-    # actually throw an error when it gets a bad cookie. It should just 
-    # look like there was no cookie to begin with.
+    # Either the cookie or token is invalid and we are not authenticating
+    # via a webservice, or we did not receive a cookie or token. We don't
+    # want to ever return AUTH_LOGINFAILED, because we don't want Bugzilla to
+    # actually throw an error when it gets a bad cookie or token. It should just
+    # look like there was no cookie or token to begin with.
     return { failure => AUTH_NODATA };
 }
 
@@ -97,9 +104,7 @@ sub login_token {
 
     return $self->{'_login_token'} if exists $self->{'_login_token'};
 
-    if ($usage_mode ne USAGE_MODE_XMLRPC
-        && $usage_mode ne USAGE_MODE_JSON
-        && $usage_mode ne USAGE_MODE_REST) {
+    if (!i_am_webservice()) {
         return $self->{'_login_token'} = undef;
     }
 
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 4b227e9d2..e1f7f3b60 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -837,10 +837,7 @@ sub create {
                 # (Wrapping the message in the WebService is unnecessary
                 # and causes awkward things like \n's appearing in error
                 # messages in JSON-RPC.)
-                unless (Bugzilla->usage_mode == USAGE_MODE_JSON
-                        or Bugzilla->usage_mode == USAGE_MODE_XMLRPC
-                        or Bugzilla->usage_mode == USAGE_MODE_REST)
-                {
+                unless (i_am_webservice()) {
                     $var = wrap_comment($var, 72);
                 }
                 $var =~ s/\&nbsp;/ /g;
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index a3651182a..a9ff86c8b 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -14,8 +14,8 @@ use parent qw(Exporter);
 @Bugzilla::Util::EXPORT = qw(trick_taint detaint_natural detaint_signed
                              html_quote url_quote xml_quote
                              css_class_quote html_light_quote
-                             i_am_cgi correct_urlbase remote_ip validate_ip
-                             do_ssl_redirect_if_required use_attachbase
+                             i_am_cgi i_am_webservice correct_urlbase remote_ip
+                             validate_ip do_ssl_redirect_if_required use_attachbase
                              diff_arrays on_main_db
                              trim wrap_hard wrap_comment find_wrap_point
                              format_time validate_date validate_time datetime_from
@@ -237,6 +237,13 @@ sub i_am_cgi {
     return exists $ENV{'SERVER_SOFTWARE'} ? 1 : 0;
 }
 
+sub i_am_webservice {
+    my $usage_mode = Bugzilla->usage_mode;
+    return $usage_mode == USAGE_MODE_XMLRPC
+           || $usage_mode == USAGE_MODE_JSON
+           || $usage_mode == USAGE_MODE_REST;
+}
+
 # This exists as a separate function from Bugzilla::CGI::redirect_to_https
 # because we don't want to create a CGI object during XML-RPC calls
 # (doing so can mess up XML-RPC).
@@ -847,6 +854,7 @@ Bugzilla::Util - Generic utility functions for bugzilla
 
   # Functions that tell you about your environment
   my $is_cgi   = i_am_cgi();
+  my $is_webservice = i_am_webservice();
   my $urlbase  = correct_urlbase();
 
   # Data manipulation
@@ -974,6 +982,11 @@ Tells you whether or not you are being run as a CGI script in a web
 server. For example, it would return false if the caller is running
 in a command-line script.
 
+=item C<i_am_webservice()>
+
+Tells you whether or not the current usage mode is WebServices related
+such as JSONRPC, XMLRPC, or REST.
+
 =item C<correct_urlbase()>
 
 Returns either the C<sslbase> or C<urlbase> parameter, depending on the
diff --git a/Bugzilla/WebService.pm b/Bugzilla/WebService.pm
index 03548d257..92ffed659 100644
--- a/Bugzilla/WebService.pm
+++ b/Bugzilla/WebService.pm
@@ -181,6 +181,13 @@ For REST, you may also use the C<username> and C<password> variable
 names instead of C<Bugzilla_login> and C<Bugzilla_password> as a
 convenience.
 
+=item B<Added in Bugzilla 5.0>
+
+An error is now thrown if you pass invalid cookies or an invalid token.
+You will need to log in again to get new cookies or a new token. Previous
+releases simply ignored invalid cookies and token support was added in
+Bugzilla B<5.0>.
+
 =back
 
 =head1 STABLE, EXPERIMENTAL, and UNSTABLE
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 038704c34..1a3aa07ac 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -1054,6 +1054,11 @@
       the "Forgot Password" link.
     [% END %]
 
+  [% ELSIF error == "invalid_cookies_or_token" %]
+    [% title = "Invalid Cookies or Token" %]
+    The cookies or token provide were not valid or have expired.
+    You may login again to get new cookies or a new token.
+
   [% ELSIF error == "json_rpc_get_method_required" %]
     When using JSON-RPC over GET, you must specify a 'method'
     parameter. See the documentation at

From d3cf6b248e039a04f291d1c9fc7a5702cace0de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 26 Sep 2013 20:26:45 +0200
Subject: [PATCH 231/240] Bug 920787: The "Flags:" label in bug reports is
 badly aligned r=dkl a=sgreen

---
 skins/standard/show_bug.css            | 3 ---
 template/en/default/bug/edit.html.tmpl | 7 ++-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/skins/standard/show_bug.css b/skins/standard/show_bug.css
index b776b60bc..2d5ba4309 100644
--- a/skins/standard/show_bug.css
+++ b/skins/standard/show_bug.css
@@ -26,9 +26,6 @@
     width: 10em;
 }
 
-.flags_label {
-    text-align: left;
-}
 table#flags {
     width: auto;
 }
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 8f1a2031b..8d38152fd 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -878,13 +878,10 @@
   [% END %]
   [% IF show_bug_flags %]
     <tr>
-      <th class="field_label flags_label">
+      <th class="field_label">
         <label>Flags:</label>
       </th>
-      <td></td>
-    </tr>
-    <tr>
-      <td colspan="2">
+      <td>
         [% IF bug.flag_types.size %]
           [% PROCESS "flag/list.html.tmpl" flag_no_header = 1
                                            flag_types = bug.flag_types

From 19840b6e163cff86d1374fb8e087e32c16d3f311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 26 Sep 2013 20:56:01 +0200
Subject: [PATCH 232/240] fix bustage due to bug 891236: it doesn't pass
 t/002goodperl.t

---
 extensions/MoreBugUrl/lib/Redmine.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/MoreBugUrl/lib/Redmine.pm b/extensions/MoreBugUrl/lib/Redmine.pm
index 60c2ad90c..a1c1382ce 100644
--- a/extensions/MoreBugUrl/lib/Redmine.pm
+++ b/extensions/MoreBugUrl/lib/Redmine.pm
@@ -6,8 +6,10 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::MoreBugUrl::Redmine;
+
+use 5.10.1;
 use strict;
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####

From 9e7a6fa5aabab56a1155a58992cb14a0da558728 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Thu, 26 Sep 2013 21:14:16 +0200
Subject: [PATCH 233/240] Bug 784072 (2nd part): Exclude extensions from POD
 coverage checks

---
 t/011pod.t | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/t/011pod.t b/t/011pod.t
index d4e0fb780..7709ade16 100644
--- a/t/011pod.t
+++ b/t/011pod.t
@@ -43,6 +43,7 @@ use constant MODULE_WHITELIST => qw(
     Bugzilla::Auth::Verify::
     Bugzilla::BugUrl::
     Bugzilla::Config::
+    Bugzilla::Extension::
     Bugzilla::Job::
 );
 
@@ -82,6 +83,7 @@ foreach my $file (@module_files) {
     my $module = $file;
     $module =~ s/\.pm$//;
     $module =~ s#/#::#g;
+    $module =~ s/^extensions/Bugzilla::Extension/;
 
     my @whitelist = (DEFAULT_WHITELIST);
     push(@whitelist, $sub_whitelist{$module}) if $sub_whitelist{$module};

From de1fc19ac7a13cae4fac9631076a7362eaa9ec7b Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Thu, 26 Sep 2013 17:26:53 -0400
Subject: [PATCH 234/240] Bug 917483 - Bug.update_attachment causes error when
 updating filename using key 'file_name'

---
 Bugzilla/WebService/Bug.pm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index eaca97f91..250284d61 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -17,7 +17,7 @@ use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Field;
 use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Util qw(filter filter_wants validate);
+use Bugzilla::WebService::Util qw(filter filter_wants validate translate);
 use Bugzilla::Bug;
 use Bugzilla::BugMail;
 use Bugzilla::Util qw(trick_taint trim diff_arrays);
@@ -55,6 +55,20 @@ use constant READ_ONLY => qw(
     search
 );
 
+use constant ATTACHMENT_MAPPED_SETTERS => {
+    file_name => 'filename',
+    summary   => 'description',
+};
+
+use constant ATTACHMENT_MAPPED_RETURNS => {
+    description => 'summary',
+    ispatch     => 'is_patch',
+    isprivate   => 'is_private',
+    isobsolete  => 'is_obsolete',
+    filename    => 'file_name',
+    mimetype    => 'content_type',
+};
+
 ######################################################
 # Add aliases here for old method name compatibility #
 ######################################################
@@ -751,9 +765,8 @@ sub update_attachment {
 
     # We can't update flags, and summary is really description
     delete $params->{flags};
-    if (exists $params->{summary}) {
-        $params->{description} = delete $params->{summary};
-    }
+
+    $params = translate($params, ATTACHMENT_MAPPED_SETTERS);
 
     # Get all the attachments, after verifying that they exist and are editable
     my @attachments = ();
@@ -782,6 +795,8 @@ sub update_attachment {
     foreach my $attachment (@attachments) {
         my $changes = $attachment->update();
 
+        $changes = translate($changes, ATTACHMENT_MAPPED_RETURNS);
+
         my %hash = (
             id               => $self->type('int', $attachment->id),
             last_change_time => $self->type('dateTime', $attachment->modification_time),
@@ -790,8 +805,6 @@ sub update_attachment {
 
         foreach my $field (keys %$changes) {
             my $change = $changes->{$field};
-            # Description is shown as summary to the user
-            $field = 'summary' if $field eq 'description';
 
             # We normalize undef to an empty string, so that the API
             # stays consistent for things like Deadline that can become

From 7c8a0b0c59772e11d179ed51e4d82999877f830a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sat, 28 Sep 2013 00:37:03 +0200
Subject: [PATCH 235/240] Bug 851267: Bugzilla times out when a user has
 several thousands of votes r=dkl a=justdave

---
 Bugzilla/CGI.pm                               |   8 +-
 extensions/Voting/Extension.pm                | 158 +++++++++---------
 .../en/default/pages/voting/user.html.tmpl    |  19 +--
 3 files changed, 91 insertions(+), 94 deletions(-)

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 991bfc05d..05863bf02 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -473,9 +473,9 @@ sub redirect_search_url {
 
     # GET requests that lacked a list_id are always redirected. POST requests
     # are only redirected if they're under the CGI_URI_LIMIT though.
-    my $uri_length = length($self->self_url());
-    if ($self->request_method() ne 'POST' or $uri_length < CGI_URI_LIMIT) {
-        print $self->redirect(-url => $self->self_url());
+    my $self_url = $self->self_url();
+    if ($self->request_method() ne 'POST' or length($self_url) < CGI_URI_LIMIT) {
+        print $self->redirect(-url => $self_url);
         exit;
     }
 }
@@ -529,7 +529,7 @@ sub url_is_attachment_base {
         $regex =~ s/\\\%bugid\\\%/\\d+/;
     }
     $regex = "^$regex";
-    return ($self->self_url =~ $regex) ? 1 : 0;
+    return ($self->url =~ $regex) ? 1 : 0;
 }
 
 sub set_dated_content_disp {
diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm
index 387d44ee0..aa93ec235 100644
--- a/extensions/Voting/Extension.pm
+++ b/extensions/Voting/Extension.pm
@@ -21,7 +21,7 @@ use Bugzilla::User;
 use Bugzilla::Util qw(detaint_natural);
 use Bugzilla::Token;
 
-use List::Util qw(min);
+use List::Util qw(min sum);
 
 use constant VERSION => BUGZILLA_VERSION;
 use constant DEFAULT_VOTES_PER_BUG => 1;
@@ -187,7 +187,7 @@ sub bug_end_of_update {
         # If some votes have been removed, RemoveVotes() returns
         # a list of messages to send to voters.
         @msgs = _remove_votes($bug->id, 0, 'votes_bug_moved');
-        _confirm_if_vote_confirmed($bug->id);
+        _confirm_if_vote_confirmed($bug);
 
         foreach my $msg (@msgs) {
             MessageToMTA($msg);
@@ -391,7 +391,7 @@ sub _page_user {
     # If a bug_id is given, and we're editing, we'll add it to the votes list.
     
     my $bug_id = $input->{bug_id};
-    my $bug = Bugzilla::Bug->check($bug_id) if $bug_id;
+    my $bug = Bugzilla::Bug->check({ id => $bug_id, cache => 1 }) if $bug_id;
     my $who_id = $input->{user_id} || $user->id;
 
     # Logged-out users must specify a user_id.
@@ -420,53 +420,38 @@ sub _page_user {
     foreach my $product (@{ $user->get_selectable_products }) {
         next unless ($product->{votesperuser} > 0);
 
-        my @bugs;
-        my @bug_ids;
-        my $total = 0;
-        my $onevoteonly = 0;
-
         my $vote_list =
-            $dbh->selectall_arrayref('SELECT votes.bug_id, votes.vote_count,
-                                             bugs.short_desc
-                                        FROM votes
-                                  INNER JOIN bugs
-                                          ON votes.bug_id = bugs.bug_id
-                                       WHERE votes.who = ?
-                                         AND bugs.product_id = ?
-                                    ORDER BY votes.bug_id',
-                                      undef, ($who->id, $product->id));
+          $dbh->selectall_arrayref('SELECT votes.bug_id, votes.vote_count
+                                      FROM votes
+                                INNER JOIN bugs
+                                        ON votes.bug_id = bugs.bug_id
+                                     WHERE votes.who = ?
+                                       AND bugs.product_id = ?',
+                                     undef, ($who->id, $product->id));
 
-        $user->visible_bugs([map { $_->[0] } @$vote_list]);
-        foreach (@$vote_list) {
-            my ($id, $count, $summary) = @$_;
-            $total += $count;
+        my %votes = map { $_->[0] => $_->[1] } @$vote_list;
+        my @bug_ids = sort keys %votes;
+        # Exclude bugs that the user can no longer see.
+        @bug_ids = @{ $user->visible_bugs(\@bug_ids) };
+        next unless scalar @bug_ids;
 
-            # Next if user can't see this bug. So, the totals will be correct
-            # and they can see there are votes 'missing', but not on what bug
-            # they are. This seems a reasonable compromise; the alternative is
-            # to lie in the totals.
-            next if !$user->can_see_bug($id);
-
-            push (@bugs, { id => $id,
-                           summary => $summary,
-                           count => $count });
-            push (@bug_ids, $id);
-            push (@all_bug_ids, $id);
-        }
+        push(@all_bug_ids, @bug_ids);
+        my @bugs = @{ Bugzilla::Bug->new_from_list(\@bug_ids) };
+        $_->{count} = $votes{$_->id} foreach @bugs;
+        # We include votes from bugs that the user can no longer see.
+        my $total = sum(values %votes) || 0;
 
+        my $onevoteonly = 0;
         $onevoteonly = 1 if (min($product->{votesperuser},
                                  $product->{maxvotesperbug}) == 1);
 
-        # Only add the product for display if there are any bugs in it.
-        if ($#bugs > -1) {
-            push (@products, { name => $product->name,
-                               bugs => \@bugs,
-                               bug_ids => \@bug_ids,
-                               onevoteonly => $onevoteonly,
-                               total => $total,
-                               maxvotes => $product->{votesperuser},
-                               maxperbug => $product->{maxvotesperbug} });
-        }
+        push(@products, { name => $product->name,
+                          bugs => \@bugs,
+                          bug_ids => \@bug_ids,
+                          onevoteonly => $onevoteonly,
+                          total => $total,
+                          maxvotes => $product->{votesperuser},
+                          maxperbug => $product->{maxvotesperbug} });
     }
 
     if ($canedit && $bug) {
@@ -500,6 +485,7 @@ sub _update_votes {
     # IDs and the field values are the number of votes.
 
     my @buglist = grep {/^\d+$/} keys %$input;
+    my (%bugs, %votes);
 
     # If no bugs are in the buglist, let's make sure the user gets notified
     # that their votes will get nuked if they continue.
@@ -515,20 +501,23 @@ sub _update_votes {
             exit;
         }
     }
+    else {
+        $user->visible_bugs(\@buglist);
+        my $bugs_obj = Bugzilla::Bug->new_from_list(\@buglist);
+        $bugs{$_->id} = $_ foreach @$bugs_obj;
+    }
 
-    # Call check() on each bug ID to make sure it is a positive
-    # integer representing an existing bug that the user is authorized 
-    # to access, and make sure the number of votes submitted is also
-    # a non-negative integer (a series of digits not preceded by a
-    # minus sign).
-    my (%votes, @bugs);
+    # Call check_is_visible() on each bug to make sure it is an existing bug
+    # that the user is authorized to access, and make sure the number of votes
+    # submitted is also an integer.
     foreach my $id (@buglist) {
-      my $bug = Bugzilla::Bug->check($id);
-      push(@bugs, $bug);
-      $id = $bug->id;
-      $votes{$id} = $input->{$id};
-      detaint_natural($votes{$id})
-        || ThrowUserError("voting_must_be_nonnegative");
+        my $bug = $bugs{$id}
+          or ThrowUserError('bug_id_does_not_exist', { bug_id => $id });
+        $bug->check_is_visible;
+        $id = $bug->id;
+        $votes{$id} = $input->{$id};
+        detaint_natural($votes{$id})
+          || ThrowUserError("voting_must_be_nonnegative");
     }
 
     my $token = $cgi->param('token');
@@ -541,10 +530,10 @@ sub _update_votes {
 
     # If the user is voting for bugs, make sure they aren't overstuffing
     # the ballot box.
-    if (scalar @bugs) {
+    if (scalar @buglist) {
         my (%prodcount, %products);
-        foreach my $bug (@bugs) {
-            my $bug_id = $bug->id;
+        foreach my $bug_id (keys %bugs) {
+            my $bug = $bugs{$bug_id};
             my $prod = $bug->product;
             $products{$prod} ||= $bug->product_obj;
             $prodcount{$prod} ||= 0;
@@ -568,56 +557,65 @@ sub _update_votes {
         }
     }
 
-    # Update the user's votes in the database.  If the user did not submit 
-    # any votes, they may be using a form with checkboxes to remove all their
-    # votes (checkboxes are not submitted along with other form data when
-    # they are not checked, and Bugzilla uses them to represent single votes
-    # for products that only allow one vote per bug).  In that case, we still
-    # need to clear the user's votes from the database.
-    my %affected;
+    # Update the user's votes in the database.
     $dbh->bz_start_transaction();
 
-    # Take note of, and delete the user's old votes from the database.
-    my $bug_list = $dbh->selectcol_arrayref('SELECT bug_id FROM votes
+    my $old_list = $dbh->selectall_arrayref('SELECT bug_id, vote_count FROM votes
                                              WHERE who = ?', undef, $who);
 
-    foreach my $id (@$bug_list) {
-        $affected{$id} = 1;
-    }
-    $dbh->do('DELETE FROM votes WHERE who = ?', undef, $who);
+    my %old_votes = map { $_->[0] => $_->[1] } @$old_list;
 
     my $sth_insertVotes = $dbh->prepare('INSERT INTO votes (who, bug_id, vote_count)
                                          VALUES (?, ?, ?)');
+    my $sth_updateVotes = $dbh->prepare('UPDATE votes SET vote_count = ?
+                                         WHERE bug_id = ? AND who = ?');
 
-    # Insert the new values in their place
-    foreach my $id (@buglist) {
-        if ($votes{$id} > 0) {
+    my %affected = map { $_ => 1 } (@buglist, keys %old_votes);
+    my @deleted_votes;
+
+    foreach my $id (keys %affected) {
+        if (!$votes{$id}) {
+            push(@deleted_votes, $id);
+            next;
+        }
+        if ($votes{$id} == ($old_votes{$id} || 0)) {
+            delete $affected{$id};
+            next;
+        }
+        # We use 'defined' in case 0 was accidentally stored in the DB.
+        if (defined $old_votes{$id}) {
+            $sth_updateVotes->execute($votes{$id}, $id, $who);
+        }
+        else {
             $sth_insertVotes->execute($who, $id, $votes{$id});
         }
-        $affected{$id} = 1;
+    }
+
+    if (@deleted_votes) {
+        $dbh->do('DELETE FROM votes WHERE who = ? AND ' .
+                 $dbh->sql_in('bug_id', \@deleted_votes), undef, $who);
     }
 
     # Update the cached values in the bugs table
-    print $cgi->header();
     my @updated_bugs = ();
 
     my $sth_getVotes = $dbh->prepare("SELECT SUM(vote_count) FROM votes
                                       WHERE bug_id = ?");
 
-    my $sth_updateVotes = $dbh->prepare("UPDATE bugs SET votes = ?
-                                         WHERE bug_id = ?");
+    $sth_updateVotes = $dbh->prepare('UPDATE bugs SET votes = ? WHERE bug_id = ?');
 
     foreach my $id (keys %affected) {
         $sth_getVotes->execute($id);
         my $v = $sth_getVotes->fetchrow_array || 0;
         $sth_updateVotes->execute($v, $id);
 
-        my $confirmed = _confirm_if_vote_confirmed($id);
+        my $confirmed = _confirm_if_vote_confirmed($bugs{$id} || $id);
         push (@updated_bugs, $id) if $confirmed;
     }
 
     $dbh->bz_commit_transaction();
 
+    print $cgi->header() if scalar @updated_bugs;
     $vars->{'type'} = "votes";
     $vars->{'title_tag'} = 'change_votes';
     foreach my $bug_id (@updated_bugs) {
@@ -828,7 +826,7 @@ sub _remove_votes {
 # confirm a bug has been reduced, check if the bug is now confirmed.
 sub _confirm_if_vote_confirmed {
     my $id = shift;
-    my $bug = new Bugzilla::Bug($id);
+    my $bug = ref $id ? $id : new Bugzilla::Bug({ id => $id, cache => 1 });
 
     my $ret = 0;
     if (!$bug->everconfirmed
diff --git a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
index b1cf53a85..b08b4c878 100644
--- a/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
+++ b/extensions/Voting/template/en/default/pages/voting/user.html.tmpl
@@ -85,8 +85,7 @@
         </tr>
 
         [% FOREACH bug = product.bugs %]
-          <tr [% IF bug.id == this_bug.id && canedit %] 
-            class="bz_bug_being_voted_on" [% END %]>
+          <tr [% IF bug.id == this_bug.id && canedit %] class="bz_bug_being_voted_on"[% END %]>
             <td>
               [% IF bug.id == this_bug.id && canedit %]
                 [% IF product.onevoteonly %]
@@ -96,25 +95,25 @@
                 [% END %]
               [%- END %]
             </td>
-            <td align="right"><a name="vote_[% bug.id FILTER html %]">
+            <td align="right"><a name="vote_[% bug.id FILTER none %]">
               [% IF canedit %]
                 [% IF product.onevoteonly %]
-                  <input type="checkbox" name="[% bug.id FILTER html %]" value="1"
-                    [% " checked" IF bug.count %] id="bug_[% bug.id FILTER html %]">
+                  <input type="checkbox" name="[% bug.id FILTER none %]" value="1"
+                    [% " checked" IF bug.count %] id="bug_[% bug.id FILTER none %]">
                 [% ELSE %]
-                  <input name="[% bug.id FILTER html %]" value="[% bug.count FILTER html %]"
-                         size="2" id="bug_[% bug.id FILTER html %]">
+                  <input name="[% bug.id FILTER none %]" value="[% bug.count FILTER html %]"
+                         size="2" id="bug_[% bug.id FILTER none %]">
                 [% END %]
               [% ELSE %]
                 [% bug.count FILTER html %]
               [% END %]
             </a></td>
             <td align="center">
-              [% bug.id FILTER bug_link(bug.id) FILTER none %]
+              [% PROCESS bug/link.html.tmpl bug = bug, link_text = bug.id %]
             </td>
             <td>
-              [% bug.summary FILTER html %]
-              (<a href="page.cgi?id=voting/bug.html&amp;bug_id=[% bug.id FILTER uri %]">Show Votes</a>)
+              [% bug.short_desc FILTER html %]
+              (<a href="page.cgi?id=voting/bug.html&amp;bug_id=[% bug.id FILTER none %]">Show Votes</a>)
             </td>
           </tr>
         [% END %]

From 867845b03a6fff11850cb0f649e214741f2861ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sat, 28 Sep 2013 00:59:33 +0200
Subject: [PATCH 236/240] Bug 340160: Speed up LogActivityEntry() r=dkl
 a=justdave

---
 Bugzilla/Bug.pm   | 11 ++++++-----
 Bugzilla/Field.pm | 13 ++++---------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 4d2421a59..3000bd0ae 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3953,7 +3953,11 @@ sub get_activity {
 # Update the bugs_activity table to reflect changes made in bugs.
 sub LogActivityEntry {
     my ($i, $col, $removed, $added, $whoid, $timestamp, $comment_id) = @_;
-    my $dbh = Bugzilla->dbh;
+    state $sth =
+      Bugzilla->dbh->prepare('INSERT INTO bugs_activity
+                              (bug_id, who, bug_when, fieldid, removed, added, comment_id)
+                              VALUES (?, ?, ?, ?, ?, ?, ?)');
+
     # in the case of CCs, deps, and keywords, there's a possibility that someone
     # might try to add or remove a lot of them at once, which might take more
     # space than the activity table allows.  We'll solve this by splitting it
@@ -3977,10 +3981,7 @@ sub LogActivityEntry {
         trick_taint($addstr);
         trick_taint($removestr);
         my $fieldid = get_field_id($col);
-        $dbh->do("INSERT INTO bugs_activity
-                  (bug_id, who, bug_when, fieldid, removed, added, comment_id)
-                  VALUES (?, ?, ?, ?, ?, ?, ?)",
-                  undef, ($i, $whoid, $timestamp, $fieldid, $removestr, $addstr, $comment_id));
+        $sth->execute($i, $whoid, $timestamp, $fieldid, $removestr, $addstr, $comment_id);
     }
 }
 
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index c4ee77498..ebc043ab7 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -1324,7 +1324,7 @@ sub check_field {
 Description: Returns the ID of the specified field name and throws
              an error if this field does not exist.
 
-Params:      $name - a field name
+Params:      $fieldname - a field name
 
 Returns:     the corresponding field ID or an error if the field name
              does not exist.
@@ -1334,15 +1334,10 @@ Returns:     the corresponding field ID or an error if the field name
 =cut
 
 sub get_field_id {
-    my ($name) = @_;
-    my $dbh = Bugzilla->dbh;
+    my $field = Bugzilla->fields({ by_name => 1 })->{$_[0]}
+      or ThrowCodeError('invalid_field_name', {field => $_[0]});
 
-    trick_taint($name);
-    my $id = $dbh->selectrow_array('SELECT id FROM fielddefs
-                                    WHERE name = ?', undef, $name);
-
-    ThrowCodeError('invalid_field_name', {field => $name}) unless $id;
-    return $id
+    return $field->id;
 }
 
 1;

From f9ff478d452fc0a57922daecd515e4f140d2f512 Mon Sep 17 00:00:00 2001
From: Imran Chaudhry <ichaudhry+mozilla@gmail.com>
Date: Sat, 28 Sep 2013 01:09:29 +0200
Subject: [PATCH 237/240] Bug 798927: An error should be thrown when passing an
 illegal pronoun r=LpSolit a=justdave

---
 Bugzilla/Search.pm                              | 3 ++-
 template/en/default/global/user-error.html.tmpl | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index a7600f449..7bd4381ed 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -2196,7 +2196,8 @@ sub pronoun {
     if ($noun eq "%qacontact%") {
         return "COALESCE(bugs.qa_contact,0)";
     }
-    return 0;
+
+    ThrowUserError('illegal_pronoun', { pronoun => $noun });
 }
 
 sub _contact_pronoun {
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 1a3aa07ac..939eb2c3c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -891,6 +891,13 @@
     Your group control combination for group &quot;
     [% groupname FILTER html %]&quot; is illegal.
 
+  [% ELSIF error == "illegal_pronoun" %]
+    [% title = "Illegal Pronoun" %]
+    The pronoun you used ([% pronoun FILTER html %]) is illegal. You must use
+    one of the approved pronouns. Please see
+    <a href="[% docs_urlbase FILTER html %]query.html#pronouns">Pronoun Substitution</a>
+    for a complete list.
+
   [% ELSIF error == "illegal_query_name" %]
     [% title = "Illegal Search Name" %]
     The name of your search cannot contain any of the following characters: 

From 22e06225f47a70352c99d5302291a6a58b53ff6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sat, 28 Sep 2013 13:32:18 +0200
Subject: [PATCH 238/240] Bug 891311: Text in the "My Requests" page is
 misleading about how the AND/OR radio button works r=dkl a=justdave

---
 request.cgi                                 | 58 +++++++++++----------
 template/en/default/request/queue.html.tmpl | 12 ++---
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/request.cgi b/request.cgi
index 436f94bc4..118935092 100755
--- a/request.cgi
+++ b/request.cgi
@@ -155,22 +155,8 @@ sub queue {
     # need to display a "status" column in the report because the value for that
     # column will always be the same.
     my @excluded_columns = ();
-    
     my $do_union = $cgi->param('do_union');
 
-    # Filter requests by status: "pending", "granted", "denied", "all" 
-    # (which means any), or "fulfilled" (which means "granted" or "denied").
-    if ($status) {
-        if ($status eq "+-") {
-            push(@criteria, "flags.status IN ('+', '-')");
-            push(@excluded_columns, 'status') unless $do_union;
-        }
-        elsif ($status ne "all") {
-            push(@criteria, "flags.status = '$status'");
-            push(@excluded_columns, 'status') unless $do_union;
-        }
-    }
-    
     # Filter results by exact email address of requester or requestee.
     if (defined $cgi->param('requester') && $cgi->param('requester') ne "") {
         my $requester = $dbh->quote($cgi->param('requester'));
@@ -182,23 +168,44 @@ sub queue {
         if ($cgi->param('requestee') ne "-") {
             my $requestee = $dbh->quote($cgi->param('requestee'));
             trick_taint($requestee); # Quoted above
-            push(@criteria, $dbh->sql_istrcmp('requestees.login_name',
-                            $requestee));
+            push(@criteria, $dbh->sql_istrcmp('requestees.login_name', $requestee));
+        }
+        else {
+            push(@criteria, "flags.requestee_id IS NULL");
         }
-        else { push(@criteria, "flags.requestee_id IS NULL") }
         push(@excluded_columns, 'requestee') unless $do_union;
     }
-    
+
+    # If the user wants requester = foo OR requestee = bar, we have to join
+    # these criteria separately as all other criteria use AND.
+    if (@criteria == 2 && $do_union) {
+        my $union = join(' OR ', @criteria);
+        @criteria = ("($union)");
+    }
+
+    # Filter requests by status: "pending", "granted", "denied", "all"
+    # (which means any), or "fulfilled" (which means "granted" or "denied").
+    if ($status) {
+        if ($status eq "+-") {
+            push(@criteria, "flags.status IN ('+', '-')");
+            push(@excluded_columns, 'status');
+        }
+        elsif ($status ne "all") {
+            push(@criteria, "flags.status = '$status'");
+            push(@excluded_columns, 'status');
+        }
+    }
+
     # Filter results by exact product or component.
     if (defined $cgi->param('product') && $cgi->param('product') ne "") {
         my $product = Bugzilla::Product->check(scalar $cgi->param('product'));
         push(@criteria, "bugs.product_id = " . $product->id);
-        push(@excluded_columns, 'product') unless $do_union;
+        push(@excluded_columns, 'product');
         if (defined $cgi->param('component') && $cgi->param('component') ne "") {
             my $component = Bugzilla::Component->check({ product => $product,
                                                          name => scalar $cgi->param('component') });
             push(@criteria, "bugs.component_id = " . $component->id);
-            push(@excluded_columns, 'component') unless $do_union;
+            push(@excluded_columns, 'component');
         }
     }
 
@@ -216,14 +223,11 @@ sub queue {
         my $quoted_form_type = $dbh->quote($form_type);
         trick_taint($quoted_form_type); # Already SQL quoted
         push(@criteria, "flagtypes.name = " . $quoted_form_type);
-        push(@excluded_columns, 'type') unless $do_union;
+        push(@excluded_columns, 'type');
     }
-    
-    # Add the criteria to the query. Do a union if OR is selected.
-    # Otherwise do an intersection.
-    my $and_or = $do_union ? ' OR ' : ' AND ';
-    $query .= " AND (" . join($and_or, @criteria) . ") " if scalar(@criteria);
-    
+
+    $query .= ' AND ' . join(' AND ', @criteria) if scalar(@criteria);
+
     # Group the records by flag ID so we don't get multiple rows of data
     # for each flag.  This is only necessary because of the code that
     # removes flags on bugs the user is unauthorized to access.
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 68a519725..2fb417eb6 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -147,18 +147,16 @@ to some group are shown by default.
     <tr>
       <th></th>
       <td>
-        <label><input type="radio" name="do_union" value="0" 
-            [% 'checked="checked"' IF !cgi.param('do_union') %]>AND *</label>
-        <label><input type="radio" name="do_union" value="1" 
-            [% 'checked="checked"' IF cgi.param('do_union') %]>OR *</label>
+        <select id="do_union" name="do_union">
+          <option value="0">Match the requester AND requestee</option>
+          <option value="1" [% 'selected="selected"' IF cgi.param('do_union') %]>
+            Match the requester OR requestee</option>
+        </select>
       </td>
       <td colspan="3"></td>
       <td><input type="submit" id="filter" value="Filter"></td>
     </tr>
   </table>
-
-  <p>(* The logical conjunction/disjunction between the requester 
-          and the requestee)</p>
 </form>
 
 [% column_headers = {

From f5bdb0a79a9579fde68799084e12995f75df8874 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Sun, 29 Sep 2013 23:50:14 -0400
Subject: [PATCH 239/240] Bug 864625 - Setting a non-privileged user as a
 requestee on a secure bug while ccing the same user to give access at the
 same r=LpSolit,a=sgreen

---
 Bugzilla/Flag.pm | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index e1e75f832..8931649e4 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -397,7 +397,7 @@ sub _validate {
     my $old_requestee_id = $obj_flag->requestee_id;
 
     $obj_flag->_set_status($params->{status});
-    $obj_flag->_set_requestee($params->{requestee}, $attachment, $params->{skip_roe});
+    $obj_flag->_set_requestee($params->{requestee}, $bug, $attachment, $params->{skip_roe});
 
     # The requestee ID can be undefined.
     my $requestee_changed = ($obj_flag->requestee_id || 0) != ($old_requestee_id || 0);
@@ -623,10 +623,10 @@ sub force_retarget {
 ###############################
 
 sub _set_requestee {
-    my ($self, $requestee, $attachment, $skip_requestee_on_error) = @_;
+    my ($self, $requestee, $bug, $attachment, $skip_requestee_on_error) = @_;
 
     $self->{requestee} =
-      $self->_check_requestee($requestee, $attachment, $skip_requestee_on_error);
+      $self->_check_requestee($requestee, $bug, $attachment, $skip_requestee_on_error);
 
     $self->{requestee_id} =
       $self->{requestee} ? $self->{requestee}->id : undef;
@@ -648,7 +648,7 @@ sub _set_status {
 }
 
 sub _check_requestee {
-    my ($self, $requestee, $attachment, $skip_requestee_on_error) = @_;
+    my ($self, $requestee, $bug, $attachment, $skip_requestee_on_error) = @_;
 
     # If the flag status is not "?", then no requestee can be defined.
     return undef if ($self->status ne '?');
@@ -680,8 +680,16 @@ sub _check_requestee {
         # Note that can_see_bug() will query the DB, so if the bug
         # is being added/removed from some groups and these changes
         # haven't been committed to the DB yet, they won't be taken
-        # into account here. In this case, old restrictions matters.
-        if (!$requestee->can_see_bug($self->bug_id)) {
+        # into account here. In this case, old group restrictions matter.
+        # However, if the user has just been changed to the assignee,
+        # qa_contact, or added to the cc list of the bug and the bug
+        # is cclist_accessible, the requestee is allowed.
+        if (!$requestee->can_see_bug($self->bug_id)
+            && (!$bug->cclist_accessible
+                || !grep($_->id == $requestee->id, @{ $bug->cc_users })
+            && $requestee->id != $bug->assigned_to->id
+            && (!$bug->qa_contact || $requestee->id != $bug->qa_contact->id)))
+        {
             if ($skip_requestee_on_error) {
                 undef $requestee;
             }

From 49ae77097dec138369eaa9fc6f9318747e89df5b Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 1 Oct 2013 11:37:27 -0400
Subject: [PATCH 240/240] Bug 919852 - Add ability to perform quicksearch using
 Bug.search r/a=glob

---
 Bugzilla/Search/Quicksearch.pm |  7 +--
 Bugzilla/WebService/Bug.pm     | 83 ++++++++++++++++++++--------------
 2 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index c07c8ba03..690fcec1c 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -290,7 +290,7 @@ sub _bug_numbers_only {
     # Allow separation by comma or whitespace.
     $searchstring =~ s/[,\s]+/,/g;
 
-    if ($searchstring !~ /,/) {
+    if ($searchstring !~ /,/ && !i_am_webservice()) {
         # Single bug number; shortcut to show_bug.cgi.
         print $cgi->redirect(
             -uri => correct_urlbase() . "show_bug.cgi?id=$searchstring");
@@ -311,8 +311,9 @@ sub _handle_alias {
         # We use this direct SQL because we want quicksearch to be VERY fast.
         my $bug_id = Bugzilla->dbh->selectrow_array(
             q{SELECT bug_id FROM bugs WHERE alias = ?}, undef, $alias);
-        # If the user cannot see the bug, do not resolve its alias.
-        if ($bug_id && Bugzilla->user->can_see_bug($bug_id)) {
+        # If the user cannot see the bug or if we are using a webservice,
+        # do not resolve its alias.
+        if ($bug_id && Bugzilla->user->can_see_bug($bug_id) && !i_am_webservice()) {
             $alias = url_quote($alias);
             print Bugzilla->cgi->redirect(
                 -uri => correct_urlbase() . "show_bug.cgi?id=$alias");
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 250284d61..e2b06a378 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -26,9 +26,11 @@ use Bugzilla::Milestone;
 use Bugzilla::Status;
 use Bugzilla::Token qw(issue_hash_token);
 use Bugzilla::Search;
+use Bugzilla::Search::Quicksearch;
 
 use List::Util qw(max);
 use List::MoreUtils qw(uniq);
+use Storable qw(dclone);
 
 #############
 # Constants #
@@ -447,79 +449,86 @@ sub search {
 
     Bugzilla->switch_to_shadow_db();
 
-    if ( defined($params->{offset}) and !defined($params->{limit}) ) {
+    my $match_params = dclone($params);
+    delete $match_params->{include_fields};
+    delete $match_params->{exclude_fields};
+
+    # Determine whether this is a quicksearch query
+    if (exists $match_params->{quicksearch}) {
+        my $quicksearch = quicksearch($match_params->{'quicksearch'});
+        my $cgi = Bugzilla::CGI->new($quicksearch);
+        $match_params = $cgi->Vars;
+    }
+
+    if ( defined($match_params->{offset}) and !defined($match_params->{limit}) ) {
         ThrowCodeError('param_required',
                        { param => 'limit', function => 'Bug.search()' });
     }
 
     my $max_results = Bugzilla->params->{max_search_results};
-    unless (defined $params->{limit} && $params->{limit} == 0) {
-        if (!defined $params->{limit} || $params->{limit} > $max_results) {
-            $params->{limit} = $max_results;
+    unless (defined $match_params->{limit} && $match_params->{limit} == 0) {
+        if (!defined $match_params->{limit} || $match_params->{limit} > $max_results) {
+            $match_params->{limit} = $max_results;
         }
     }
     else {
-        delete $params->{limit};
-        delete $params->{offset};
+        delete $match_params->{limit};
+        delete $match_params->{offset};
     }
 
-    $params = Bugzilla::Bug::map_fields($params);
+    $match_params = Bugzilla::Bug::map_fields($match_params);
 
     my %options = ( fields => ['bug_id'] );
 
     # Find the highest custom field id
-    my @field_ids = grep(/^f(\d+)$/, keys %$params);
+    my @field_ids = grep(/^f(\d+)$/, keys %$match_params);
     my $last_field_id = @field_ids ? max @field_ids + 1 : 1;
 
     # Do special search types for certain fields.
-    if (my $change_when = delete $params->{'delta_ts'}) {
-        $params->{"f${last_field_id}"} = 'delta_ts';
-        $params->{"o${last_field_id}"} = 'greaterthaneq';
-        $params->{"v${last_field_id}"} = $change_when;
+    if (my $change_when = delete $match_params->{'delta_ts'}) {
+        $match_params->{"f${last_field_id}"} = 'delta_ts';
+        $match_params->{"o${last_field_id}"} = 'greaterthaneq';
+        $match_params->{"v${last_field_id}"} = $change_when;
         $last_field_id++;
     }
-    if (my $creation_when = delete $params->{'creation_ts'}) {
-        $params->{"f${last_field_id}"} = 'creation_ts';
-        $params->{"o${last_field_id}"} = 'greaterthaneq';
-        $params->{"v${last_field_id}"} = $creation_when;
+    if (my $creation_when = delete $match_params->{'creation_ts'}) {
+        $match_params->{"f${last_field_id}"} = 'creation_ts';
+        $match_params->{"o${last_field_id}"} = 'greaterthaneq';
+        $match_params->{"v${last_field_id}"} = $creation_when;
         $last_field_id++;
     }
 
     # Some fields require a search type such as short desc, keywords, etc.
     foreach my $param (qw(short_desc longdesc status_whiteboard bug_file_loc)) {
-        if (defined $params->{$param} && !defined $params->{$param . '_type'}) {
-            $params->{$param . '_type'} = 'allwordssubstr';
+        if (defined $match_params->{$param} && !defined $match_params->{$param . '_type'}) {
+            $match_params->{$param . '_type'} = 'allwordssubstr';
         }
     }
-    if (defined $params->{'keywords'} && !defined $params->{'keywords_type'}) {
-        $params->{'keywords_type'} = 'allwords';
+    if (defined $match_params->{'keywords'} && !defined $match_params->{'keywords_type'}) {
+        $match_params->{'keywords_type'} = 'allwords';
     }
 
     # Backwards compatibility with old method regarding role search
-    $params->{'reporter'} = delete $params->{'creator'} if $params->{'creator'};
+    $match_params->{'reporter'} = delete $match_params->{'creator'} if $match_params->{'creator'};
     foreach my $role (qw(assigned_to reporter qa_contact longdesc cc)) {
-        next if !exists $params->{$role};
-        my $value = delete $params->{$role};
-        $params->{"f${last_field_id}"} = $role;
-        $params->{"o${last_field_id}"} = "anywordssubstr";
-        $params->{"v${last_field_id}"} = ref $value ? join(" ", @{$value}) : $value;
+        next if !exists $match_params->{$role};
+        my $value = delete $match_params->{$role};
+        $match_params->{"f${last_field_id}"} = $role;
+        $match_params->{"o${last_field_id}"} = "anywordssubstr";
+        $match_params->{"v${last_field_id}"} = ref $value ? join(" ", @{$value}) : $value;
         $last_field_id++;
     }
 
-    my %match_params = %{ $params };
-    delete $match_params{include_fields};
-    delete $match_params{exclude_fields};
-
     # If no other parameters have been passed other than limit and offset
     # then we throw error if system is configured to do so.
-    if (!grep(!/^(limit|offset)$/, keys %match_params)
+    if (!grep(!/^(limit|offset)$/, keys %$match_params)
         && !Bugzilla->params->{search_allow_no_criteria})
     {
         ThrowUserError('buglist_parameters_required');
     }
 
-    $options{order}  = [ split(/\s*,\s*/, delete $match_params{order}) ] if $match_params{order};
-    $options{params} = \%match_params;
+    $options{order}  = [ split(/\s*,\s*/, delete $match_params->{order}) ] if $match_params->{order};
+    $options{params} = $match_params;
 
     my $search = new Bugzilla::Search(%options);
     my ($data) = $search->data;
@@ -2665,6 +2674,10 @@ C<string> Search the "Status Whiteboard" field on bugs for a substring.
 Works the same as the C<summary> field described above, but searches the
 Status Whiteboard field.
 
+=item C<quicksearch>
+
+C<string> Search for bugs using quicksearch syntax.
+
 =back
 
 =item B<Returns>
@@ -2706,9 +2719,11 @@ by system configuration.
 
 =item REST API call added in Bugzilla B<5.0>.
 
-=item Updated to allow for full search capability similar to the Bugzilla UI 
+=item Updated to allow for full search capability similar to the Bugzilla UI
 in Bugzilla B<5.0>.
 
+=item Updated to allow quicksearch capability in Bugzilla B<5.0>.
+
 =back
 
 =back