From 29b7fd293798ccacb039634ec464bb6b8a34d354 Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Thu, 30 Apr 2015 10:25:00 +0000 Subject: [PATCH] Change device_model to device_uuid_alternate for the provision override. --- app/provision/resources/classes/provision.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index de08a8fe9d..725c62a28d 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -201,7 +201,7 @@ include "root.php"; $device_description = $row["device_description"]; } } - + //find a template that was defined on another phone and use that as the default. if (strlen($device_template) == 0) { $sql = "SELECT * FROM v_devices "; @@ -304,10 +304,10 @@ include "root.php"; if ($prep_statement_3) { $prep_statement_3->execute(); $row = $prep_statement_3->fetch(); - $device_model = $row["device_model"]; - if (is_uuid($device_model)) { - //overide the original device_uuid - $device_uuid = $device_model; + $device_uuid_alternate = $row["device_uuid_alternate"]; + if (is_uuid($device_uuid_alternate)) { + //override the original device_uuid + $device_uuid = $device_uuid_alternate; //get the new devices information $sql = "SELECT * FROM v_devices "; $sql .= "WHERE device_uuid = '".$device_uuid."' ";