From 48ae736068f9953ba69c91190ef7eb7b056c2b50 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Wed, 23 Jul 2014 15:37:31 +0200 Subject: Prevent merging a package base with itself Instead of deleting the package, show an error message if a user tries to merge a package base with itself. Signed-off-by: Lukas Fleischer --- web/html/pkgbase.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'web/html/pkgbase.php') diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 4f35a67a..691639ce 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -69,12 +69,15 @@ if (check_token()) { } else { $merge_base_id = pkgbase_from_name($_POST['merge_Into']); - if ($merge_base_id) { - list($ret, $output) = pkgbase_delete($ids, $merge_base_id, $via); - unset($_GET['ID']); - } else { + if (!$merge_base_id) { $output = __("Cannot find package to merge votes and comments into."); $ret = false; + } elseif (in_array($merge_base_id, $ids)) { + $output = __("Cannot merge a package base with itself."); + $ret = false; + } else { + list($ret, $output) = pkgbase_delete($ids, $merge_base_id, $via); + unset($_GET['ID']); } } } -- cgit v1.2.3-24-g4f1b