From 1ad46ee1037c47a0f9c7ff36972daf0be45fa700 Mon Sep 17 00:00:00 2001
From: Nate Jones <git@reliberate.com>
Date: Sun, 15 Feb 2015 00:46:58 +0000
Subject: [PATCH] Devices: Fixed MAC formatting on devices list.

---
 app/devices/devices.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/devices/devices.php b/app/devices/devices.php
index 5d1263496b..f9c5f3832f 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -152,18 +152,11 @@ else {
 
 	if ($result_count > 0) {
 		foreach($result as $row) {
-			$device_mac_address = $row[device_mac_address];
-			$device_mac_address = substr($device_mac_address, 0,2).'-'.substr($device_mac_address, 2,2).'-'.substr($device_mac_address, 4,2).'-'.substr($device_mac_address, 6,2).'-'.substr($device_mac_address, 8,2).'-'.substr($device_mac_address, 10,2);
-
 			$tr_link = (permission_exists('device_edit')) ? "href='device_edit.php?id=".$row['device_uuid']."'" : null;
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>";
-			if (permission_exists('device_edit')) {
-				echo "<a href='device_edit.php?id=".$row['device_uuid']."'>".$row['device_mac_address']."</a>";
-			}
-			else {
-				echo $row['device_mac_address'];
-			}
+			$device_mac_address = substr($row['device_mac_address'], 0,2).'-'.substr($row['device_mac_address'], 2,2).'-'.substr($row['device_mac_address'], 4,2).'-'.substr($row['device_mac_address'], 6,2).'-'.substr($row['device_mac_address'], 8,2).'-'.substr($row['device_mac_address'], 10,2);
+			echo (permission_exists('device_edit')) ? "<a href='device_edit.php?id=".$row['device_uuid']."'>".$device_mac_address."</a>" : $device_mac_address;
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['device_label']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['device_vendor']."&nbsp;</td>\n";