summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/lib/pkgreqfuncs.inc.php20
1 files changed, 15 insertions, 5 deletions
diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php
index 005825fa..fcab648a 100644
--- a/web/lib/pkgreqfuncs.inc.php
+++ b/web/lib/pkgreqfuncs.inc.php
@@ -148,11 +148,21 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
* user who posted the comment was in.
*/
$username = username_from_sid($_COOKIE['AURSID']);
- $body =
- $username . " [1] filed a " . $type . " request for " .
- $row['Name'] . " [2]:\n\n" . $comments . "\n\n" .
- "[1] " . $AUR_LOCATION . get_user_uri($username) . "\n" .
- "[2] " . $AUR_LOCATION . get_pkgbase_uri($row['Name']) . "\n";
+ if ($type == 'merge') {
+ $body =
+ $username . " [1] filed a request to merge " .
+ $row['Name'] . " [2] into " . $merge_into .
+ " [3]:\n\n" . $comments . "\n\n" .
+ "[1] " . $AUR_LOCATION . get_user_uri($username) . "\n" .
+ "[2] " . $AUR_LOCATION . get_pkgbase_uri($row['Name']) . "\n" .
+ "[3] " . $AUR_LOCATION . get_pkgbase_uri($merge_into) . "\n";
+ } else {
+ $body =
+ $username . " [1] filed a " . $type . " request for " .
+ $row['Name'] . " [2]:\n\n" . $comments . "\n\n" .
+ "[1] " . $AUR_LOCATION . get_user_uri($username) . "\n" .
+ "[2] " . $AUR_LOCATION . get_pkgbase_uri($row['Name']) . "\n";
+ }
$body = wordwrap($body, 70);
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .