Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
aurweb
Commits
69deea9f
Commit
69deea9f
authored
May 24, 2019
by
Lukas Fleischer
Browse files
Ignore merge target for non-merge requests
Fixes FS#59837. Signed-off-by:
Lukas Fleischer
<
lfleischer@archlinux.org
>
parent
dd11321f
Changes
1
Hide whitespace changes
Inline
Side-by-side
web/lib/pkgreqfuncs.inc.php
View file @
69deea9f
...
...
@@ -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."
));
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment