From c07333d9c122bd6751e31dae5a7c49901f6518b2 Mon Sep 17 00:00:00 2001
From: Pami Ketolainen <pami.ketolainen@jollamobile.com>
Date: Thu, 18 Sep 2014 17:08:07 +0800
Subject: Bug 1068521: "Use of uninitialized value" warnings r=glob,a=glob

---
 Bugzilla/CGI.pm | 15 +++++++++++----
 process_bug.cgi |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 79e3e053b..18181f489 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -373,10 +373,7 @@ sub param {
         if (!scalar(@result)
             && $self->request_method && $self->request_method eq 'POST')
         {
-            # Some servers fail to set the QUERY_STRING parameter, which
-            # causes undef issues
-            $ENV{'QUERY_STRING'} = '' unless exists $ENV{'QUERY_STRING'};
-            @result = $self->SUPER::url_param(@_);
+            @result = $self->url_param(@_);
         }
 
         # Fix UTF-8-ness of input parameters.
@@ -401,6 +398,14 @@ sub param {
     return $self->SUPER::param(@_);
 }
 
+sub url_param {
+    my $self = shift;
+    # Some servers fail to set the QUERY_STRING parameter, which
+    # causes undef issues
+    $ENV{'QUERY_STRING'} //= '';
+    return $self->SUPER::url_param(@_);
+}
+
 sub _fix_utf8 {
     my $input = shift;
     # The is_utf8 is here in case CGI gets smart about utf8 someday.
@@ -732,6 +737,8 @@ L<CGI|CGI>, L<CGI::Cookie|CGI::Cookie>
 
 =item param
 
+=item url_param
+
 =item header
 
 =back
diff --git a/process_bug.cgi b/process_bug.cgi
index 4b35bf432..b47a3b1cf 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -234,7 +234,7 @@ if (should_set('keywords')) {
 }
 if (should_set('comment')) {
     my $is_markdown = ($user->settings->{use_markdown}->{is_enabled} &&
-                            $cgi->param('use_markdown') eq '1') ? 1 : 0;
+                            $cgi->param('use_markdown')) ? 1 : 0;
 
     $set_all_fields{comment} = {
         body        => scalar $cgi->param('comment'),
-- 
cgit v1.2.3-24-g4f1b