From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 17 Aug 2011 11:01:16 +0000 (+0200)
Subject: Bug 298268: editparams.cgi should accept urlbase, sslbase, etc.. with or without... 
X-Git-Tag: bugzilla-4.2rc1~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0df89d6d2a4c50dbadd2e579e53bb5e685b923f2;p=thirdparty%2Fbugzilla.git

Bug 298268: editparams.cgi should accept urlbase, sslbase, etc.. with or without a trailing slash
r=dkl a=LpSolit
---

diff --git a/editparams.cgi b/editparams.cgi
index 6affd324cc..28aac96023 100755
--- a/editparams.cgi
+++ b/editparams.cgi
@@ -100,6 +100,11 @@ if ($action eq 'save' && $current_module) {
                 # assume single linefeed is an empty string
                 $value =~ s/^\n$//;
             }
+            # Stop complaining if the URL has no trailing slash.
+            # XXX - This hack can go away once bug 303662 is implemented.
+            if ($name =~ /(?<!webdot)base$/) {
+                $value = "$value/" if ($value && $value !~ m#/$#);
+            }
         }
 
         my $changed;