Commit 69deea9f authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Ignore merge target for non-merge requests



Fixes FS#59837.
Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent dd11321f
......@@ -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."));
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment