From 9e518c6b33f5b6aadb363ff0786a391c1fda6d7b Mon Sep 17 00:00:00 2001
From: Simon Green <mail@simon.green>
Date: Wed, 29 Jul 2015 05:38:37 -0400
Subject: Bug 399078 - Remove the 'musthavemilestoneonaccept' parameter r=gerv,
 a=simon

---
 Bugzilla/API/1_0/Resource/Bugzilla.pm | 2 --
 Bugzilla/CGI.pm                       | 3 ++-
 Bugzilla/Config/Core.pm               | 6 ------
 Bugzilla/WebService/Bugzilla.pm       | 2 --
 4 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/API/1_0/Resource/Bugzilla.pm b/Bugzilla/API/1_0/Resource/Bugzilla.pm
index de9925e69..d7c3ab401 100644
--- a/Bugzilla/API/1_0/Resource/Bugzilla.pm
+++ b/Bugzilla/API/1_0/Resource/Bugzilla.pm
@@ -62,7 +62,6 @@ use constant PARAMETERS_LOGGED_IN => qw(
     attachment_base
     commentonchange_resolution
     commentonduplicate
-    cookiepath
     defaultopsys
     defaultplatform
     defaultpriority
@@ -443,7 +442,6 @@ A logged-in user can access the following parameters (listed alphabetically):
     C<attachment_base>,
     C<commentonchange_resolution>,
     C<commentonduplicate>,
-    C<cookiepath>,
     C<defaultopsys>,
     C<defaultplatform>,
     C<defaultpriority>,
diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 0b1712d2f..fcca0ec6a 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -430,7 +430,8 @@ sub send_cookie {
     ThrowCodeError('cookies_need_value') unless $paramhash{'-value'};
 
     # Add the default path and the domain in.
-    $paramhash{'-path'} = Bugzilla->params->{'cookiepath'};
+    my $uri = URI->new(Bugzilla->params->{urlbase});
+    $paramhash{'-path'} = $uri->path;
     $paramhash{'-domain'} = Bugzilla->params->{'cookiedomain'}
         if Bugzilla->params->{'cookiedomain'};
 
diff --git a/Bugzilla/Config/Core.pm b/Bugzilla/Config/Core.pm
index 654e569ba..de375e448 100644
--- a/Bugzilla/Config/Core.pm
+++ b/Bugzilla/Config/Core.pm
@@ -35,12 +35,6 @@ use constant get_param_list => (
    default => '',
    checker => \&check_sslbase
   },
-
-  {
-   name => 'cookiepath',
-   type => 't',
-   default => '/'
-  },
 );
 
 1;
diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm
index a9cef32fc..c0b44a04c 100644
--- a/Bugzilla/WebService/Bugzilla.pm
+++ b/Bugzilla/WebService/Bugzilla.pm
@@ -56,7 +56,6 @@ use constant PARAMETERS_LOGGED_IN => qw(
     attachment_base
     commentonchange_resolution
     commentonduplicate
-    cookiepath
     defaultopsys
     defaultplatform
     defaultpriority
@@ -412,7 +411,6 @@ A logged-in user can access the following parameters (listed alphabetically):
     C<attachment_base>,
     C<commentonchange_resolution>,
     C<commentonduplicate>,
-    C<cookiepath>,
     C<defaultopsys>,
     C<defaultplatform>,
     C<defaultpriority>,
-- 
cgit v1.2.3-24-g4f1b