Use $db->errstr instead of not necessarily set $@ to get error messages

interchange · Nov 2, 2017 · 7881890 · 7881890
1 parent d65c8c0
commit 7881890
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dist/lib/UI/pages/admin/pref_select.html b/dist/lib/UI/pages/admin/pref_select.html
@@ -78,7 +78,7 @@
 
 	for(grep $_, @{$CGI_array->{item_id}}) {
 		$db->delete_record($_)
-			or push @errors, $@;
+			or push @errors, $db->errstr;
 	}
 	if(@errors) {
 		my $plural = @errors > 1 ? 's' : '';

diff --git a/dist/lib/UI/profiles/db_maintenance b/dist/lib/UI/profiles/db_maintenance
@@ -143,18 +143,18 @@ __NAME__ db_maintenance
 						push @out, errmsg("Deleted %s from %s", $key, $t);
 					}
 					else {
-						push @errors, errmsg("Unable to delete %s: %s", $key, $@);
+						push @errors, errmsg("Unable to delete %s: %s", $key, $db->errstr);
 					}
 				}
 				else {
 					for(@{$CGI_array->{$idp}}) {
 #Debug("simple case regular key=$_");
 						my $rc = $db->delete_record($_);
 						if($rc) {
-						  push @out, errmsg("Deleted %s from %s", $_, $t);
+							push @out, errmsg("Deleted %s from %s", $_, $t);
 						}
 						else {
-							push @errors, errmsg("Unable to delete %s from %s: %s", $_, $t, $@);
+							push @errors, errmsg("Unable to delete %s from %s: %s", $_, $t, $db->errstr);
 						}
 					}
 				}
@@ -202,7 +202,7 @@ __NAME__ db_maintenance
 						next unless $db->record_exists($key);
 						$db->delete_record($key)
 							or do {
-								push @errors, $@;
+								push @errors, $db->errstr;
 								next;
 							};
 						push @out, errmsg("Deleted %s from %s", $key, $t);