[aur-dev] [PATCH] pkgbase.php: Fix PHP notice

Lukas Fleischer lfleischer at archlinux.org
Tue Feb 28 18:29:50 UTC 2017


Signed-off-by: Lukas Fleischer <lfleischer at archlinux.org>
---
 web/html/pkgbase.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php
index ab40984..a593af1 100644
--- a/web/html/pkgbase.php
+++ b/web/html/pkgbase.php
@@ -44,6 +44,7 @@ if (isset($_POST['IDs'])) {
 }
 
 /* Perform package base actions. */
+$via = isset($_POST['via']) ? $_POST['via'] : NULL;
 $ret = false;
 $output = "";
 $fragment = "";
@@ -56,7 +57,6 @@ if (check_token()) {
 		list($ret, $output) = pkgbase_adopt($ids, true, NULL);
 	} elseif (current_action("do_Disown")) {
 		if (isset($_POST['confirm'])) {
-			$via = isset($_POST['via']) ? $_POST['via'] : NULL;
 			list($ret, $output) = pkgbase_adopt($ids, false, $via);
 		} else {
 			$output = __("The selected packages have not been disowned, check the confirmation checkbox.");
@@ -68,7 +68,6 @@ if (check_token()) {
 		list($ret, $output) = pkgbase_vote($ids, false);
 	} elseif (current_action("do_Delete")) {
 		if (isset($_POST['confirm'])) {
-			$via = isset($_POST['via']) ? $_POST['via'] : NULL;
 			if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) {
 				list($ret, $output) = pkgbase_delete($ids, NULL, $via);
 				unset($_GET['ID']);
@@ -129,7 +128,7 @@ if (check_token()) {
 
 	if ($ret) {
 		if (current_action("do_CloseRequest") ||
-		    (current_action("do_Delete") && $_POST['via'])) {
+		    (current_action("do_Delete") && $via)) {
 			/* Redirect back to package request page on success. */
 			header('Location: ' . get_pkgreq_route());
 			exit();
-- 
2.12.0


More information about the aur-dev mailing list