[aur-dev] [PATCH v2] Only print no changes message if queries failed

Johannes Löthberg johannes at kyriasis.com
Sat Jun 27 15:48:39 UTC 2015


This commit changes the messages printed when changing the accound
details so that it only prints that no changes were made if either the
account change SQL query or the account_set_ssh_keys call failed.

Reported-by: Alexis Chotard <alexis.horgix.chotard at gmail.com>
Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
---
This should work properly. (And hopefully Lukas won't be mad at me for 
being so slow-minded today.)

 web/lib/acctfuncs.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index 417ee6d..861de0a 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -348,9 +348,9 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="",
 		$q.= " WHERE ID = ".intval($UID);
 		$result = $dbh->exec($q);
 
-		account_set_ssh_keys($UID, $ssh_keys, $ssh_fingerprints);
+		$ssh_key_result = account_set_ssh_keys($UID, $ssh_keys, $ssh_fingerprints);
 
-		if (!$result) {
+		if ($result === false || $ssh_key_result === false) {
 			print __("No changes were made to the account, %s%s%s.",
 					"<strong>", htmlspecialchars($U,ENT_QUOTES), "</strong>");
 		} else {
-- 
2.4.4


More information about the aur-dev mailing list