diff options
| author | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-04-05 13:25:47 +0200 |
|---|---|---|
| committer | Lukas Fleischer <archlinux@cryptocrack.de> | 2014-04-05 13:54:06 +0200 |
| commit | f4613442114b36d32e903b5b0608b73e32bdbc3f (patch) | |
| tree | cf8fe2f3365d41ad94b1583443034846310735a7 /web/html/pkgmerge.php | |
| parent | c1c77836a8b1e01f6a6f69d3cdd35321d5bf203e (diff) | |
| download | aur-f4613442114b36d32e903b5b0608b73e32bdbc3f.tar.gz aur-f4613442114b36d32e903b5b0608b73e32bdbc3f.tar.xz | |
Move package actions to package bases
Package actions now operate on package bases instead of packages. Move
all actions to the correct locations.
This also fixes some issues with comment notifications.
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web/html/pkgmerge.php')
| -rw-r--r-- | web/html/pkgmerge.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/web/html/pkgmerge.php b/web/html/pkgmerge.php index 834d0c91..9ffd5e74 100644 --- a/web/html/pkgmerge.php +++ b/web/html/pkgmerge.php @@ -18,18 +18,18 @@ if (isset($_COOKIE["AURSID"])) { if ($atype == "Trusted User" || $atype == "Developer"): ?> <div class="box"> - <h2><?= __('Merge Package: %s', htmlspecialchars($pkgname)) ?></h2> + <h2><?= __('Merge Package: %s', htmlspecialchars($pkgbase_name)) ?></h2> <p> <?= __('Use this form to merge the package (%s%s%s) into another package. ', - '<strong>', htmlspecialchars($pkgname), '</strong>'); ?> + '<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?> <?= __('Once the package has been merged it cannot be reversed. '); ?> <?= __('Enter the package name you wish to merge the package into. '); ?> <?= __('Select the checkbox to confirm action.') ?> </p> - <form action="<?= get_uri('/packages/'); ?>" method="post"> + <form action="<?= get_uri('/pkgbase/'); ?>" method="post"> <fieldset> - <input type="hidden" name="IDs[<?= $pkgid ?>]" value="1" /> - <input type="hidden" name="ID" value="<?= $pkgid ?>" /> + <input type="hidden" name="IDs[<?= $base_id ?>]" value="1" /> + <input type="hidden" name="ID" value="<?= $base_id ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> <p><label for="merge_Into" ><?= __("Merge into:") ?></label> <input type="text" id="merge_Into" name="merge_Into" /></p> |