summaryrefslogtreecommitdiffstats
path: root/web/template/pkgreq_results.php
diff options
context:
space:
mode:
Diffstat (limited to 'web/template/pkgreq_results.php')
-rw-r--r--web/template/pkgreq_results.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php
index 8ab8351..042cc3a 100644
--- a/web/template/pkgreq_results.php
+++ b/web/template/pkgreq_results.php
@@ -36,7 +36,11 @@
<?php else: ?>
<td><?= htmlspecialchars($row["Name"]) ?></td>
<?php endif; ?>
+ <?php if ($row['Type'] == 'merge'): ?>
+ <td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?> (<?= htmlspecialchars(ucfirst($row['MergeInto']), ENT_QUOTES); ?>)</td>
+ <?php else: ?>
<td><?= htmlspecialchars(ucfirst($row['Type']), ENT_QUOTES); ?></td>
+ <?php endif; ?>
<td class="wrap"><?= htmlspecialchars($row['Comments'], ENT_QUOTES); ?></td>
<td>
<a href="<?= get_uri('/account/') . htmlspecialchars($row['User'], ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($row['User'])) ?>"><?= htmlspecialchars($row['User']) ?></a>
@@ -47,6 +51,8 @@
<?php if ($row['BaseID']): ?>
<?php if ($row['Type'] == 'deletion'): ?>
<a href="<?= get_pkgbase_uri($row['Name']) ?>delete/?via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a>
+ <?php elseif ($row['Type'] == 'merge'): ?>
+ <a href="<?= get_pkgbase_uri($row['Name']) ?>merge/?into=<?= urlencode($row['MergeInto']) ?>&via=<?= intval($row['ID']) ?>"><?= __('Accept') ?></a>
<?php elseif ($row['Type'] == 'orphan'): ?>
<form action="<?= get_pkgbase_uri($row['Name']) . 'disown/'; ?>" method="post">
<input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" />