From 78efbfe4d1bec4879a43fbc74ff006e4cd3db3f9 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Tue, 17 Jun 2014 21:27:10 +0000
Subject: [PATCH] Minor Tweak: Enhanced delete own domain/user prevention.

---
 core/domain_settings/domains.php | 4 ++--
 core/users/users.php             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php
index c94365a99f..083eb8cc5c 100644
--- a/core/domain_settings/domains.php
+++ b/core/domain_settings/domains.php
@@ -184,8 +184,8 @@ else {
 			if (permission_exists('domain_edit')) {
 				echo "<a href='domain_edit.php?id=".$row['domain_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
 			}
-			if (permission_exists('domain_delete') && $result_count > 1) {
-				if ($_SESSION["groups"][0]["domain_uuid"] != $row['domain_uuid']) {
+			if (permission_exists('domain_delete')) {
+				if ($_SESSION["groups"][0]["domain_uuid"] != $row['domain_uuid'] && $result_count > 1) {
 					echo "<a href='domain_delete.php?id=".$row['domain_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
 				}
 				else {
diff --git a/core/users/users.php b/core/users/users.php
index bca4703d65..a8d0a01ca3 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -163,8 +163,8 @@ echo "	<td align=\"center\">\n";
 				if (permission_exists('user_edit')) {
 					echo "<a href='usersupdate.php?id=".$row['user_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
 				}
-				if (permission_exists('user_delete') && $result_count > 1) {
-					if ($_SESSION["user"]["user_uuid"] != $row['user_uuid']) {
+				if (permission_exists('user_delete')) {
+					if ($_SESSION["user"]["user_uuid"] != $row['user_uuid'] && $result_count > 1) {
 						echo "<a href='userdelete.php?id=".$row['user_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">".$v_link_label_delete."</a>";
 					}
 					else {