diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-12-13 15:28:05 +0100 |
|---|---|---|
| committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-12-13 15:28:54 +0100 |
| commit | 5ebf534ba7e90ccb12007c137ecea1cfcc4876da (patch) | |
| tree | 7bee294ccb46e920288990d6fe1b2f6c46c2cd6f /web/lib/pkgreqfuncs.inc.php | |
| parent | aa2724bbfee4b2504a4e9d27e06037639c3bc3cc (diff) | |
| download | aur-5ebf534ba7e90ccb12007c137ecea1cfcc4876da.tar.gz aur-5ebf534ba7e90ccb12007c137ecea1cfcc4876da.tar.xz | |
Avoid double slashes in notification email body
Refactor some of the URI generation code to avoid double slashes in
absolute URIs.
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web/lib/pkgreqfuncs.inc.php')
| -rw-r--r-- | web/lib/pkgreqfuncs.inc.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index e2854776..a5d6be8b 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -160,15 +160,15 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $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"; + "[1] " . get_user_uri($username, true) . "\n" . + "[2] " . get_pkgbase_uri($row['Name'], true) . "\n" . + "[3] " . get_pkgbase_uri($merge_into, true) . "\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"; + "[1] " . get_user_uri($username, true) . "\n" . + "[2] " . get_pkgbase_uri($row['Name'], true) . "\n"; } $body = wordwrap($body, 70); $cc = array_unique($cc); @@ -278,7 +278,7 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) { } if (!$auto_close) { $body .= "\n"; - $body .= "[1] " . aur_location() . get_user_uri($username); + $body .= "[1] " . get_user_uri($username, true); $body .= "\n"; } $body = wordwrap($body, 70); |