Merge tag 'release-4.4.8' into upstreamupstream

5 files changed, 18 insertions, 6 deletions

diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index bd5b2dabc..7da3697aa 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -182,7 +182,7 @@ use Memoize;
 # CONSTANTS
 #
 # Bugzilla version
-use constant BUGZILLA_VERSION => "4.4.7";
+use constant BUGZILLA_VERSION => "4.4.8";
 
 # Location of the remote and local XML files to track new releases.
 use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml';
diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm
index aba5d310b..0a0afd400 100644
--- a/Bugzilla/WebService/Server/JSONRPC.pm
+++ b/Bugzilla/WebService/Server/JSONRPC.pm
@@ -381,7 +381,7 @@ sub _argument_type_check {
 
     # Only allowed methods to be used from our whitelist
     if (none { $_ eq $method} $pkg->PUBLIC_METHODS) {
-        ThrowUserError('unknown_method', { method => $self->bz_method_name });
+        ThrowCodeError('unknown_method', { method => $self->_bz_method_name });
     }
 
     # This is the best time to do login checks.
diff --git a/checksetup.pl b/checksetup.pl
index bcc1ad8ea..ab7ea9f7a 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -15,12 +15,13 @@
 use strict;
 use 5.008001;
 use File::Basename;
+BEGIN { chdir dirname($0); }
+use lib qw(. lib);
+
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
 use Safe;
 
-BEGIN { chdir dirname($0); }
-use lib qw(. lib);
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
 use Bugzilla::Install::Util qw(install_string get_version_and_os 
diff --git a/docs/bugzilla.ent.tmpl b/docs/bugzilla.ent.tmpl
index dcf5ec140..f7a88faf1 100644
--- a/docs/bugzilla.ent.tmpl
+++ b/docs/bugzilla.ent.tmpl
@@ -1,5 +1,5 @@
-<!ENTITY bz-ver "4.4.7">
-<!ENTITY bz-date "2015-01-21">
+<!ENTITY bz-ver "4.4.8">
+<!ENTITY bz-date "2015-01-27">
 <!ENTITY current-year "2015">
 
 <!ENTITY min-perl-ver "5.8.1">
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index bafd9184a..3b7cc2994 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -45,6 +45,17 @@
 
 <h2 id="v44_point">Updates in this 4.4.x Release</h2>
 
+<h3>4.4.8</h3>
+
+<p>This releases contains the following [% terms.bug %] fix:</p>
+
+<ul>
+  <li>Fixing a regression caused by <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1090275">
+    [% terms.bug %] 10902750</a>, <kbd>JSON-RPC</kbd> API calls could crash in
+    certain cases instead of displaying the proper error message.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1124716">[% terms.Bug %] 1124716</a>)</li>
+</ul>
+
 <h3>4.4.7</h3>
 
 <p>This release contains fixes for a couple of security issues.