From 69deea9f2f7bb47a44b70ec1b4b3615778313c9a Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 24 May 2019 12:24:46 -0400 Subject: Ignore merge target for non-merge requests Fixes FS#59837. Signed-off-by: Lukas Fleischer --- web/lib/pkgreqfuncs.inc.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 774ebe7e..b8be7e54 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -127,6 +127,11 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { return array(false, __("You must be logged in to file package requests.")); } + /* Ignore merge target for non-merge requests. */ + if ($type !== 'merge') { + $merge_into = ''; + } + if (!empty($merge_into) && !preg_match("/^[a-z0-9][a-z0-9\.+_-]*$/D", $merge_into)) { return array(false, __("Invalid name: only lowercase letters are allowed.")); } -- cgit v1.2.3-24-g4f1b