From 314e16f8232e9718068844d5938468432dee418a Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Wed, 20 May 2015 06:40:24 +0000 Subject: [PATCH] Revert changes of test code that were accidently committed in revision r8208 because it was breaking provisioning when device key extension is set. --- app/provision/resources/classes/provision.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index f43b6fed9a..75bcb61585 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -458,11 +458,6 @@ include "root.php"; //get the provisioning information from device keys if (strlen($device_uuid) > 0) { - //get the vendor - $vendor = $template_name; - $template_name = 'yealink/t46g'; - $array = explode('/', $template_name); - $vendor = strtolower($array[0]); //get the device keys array $sql = "SELECT * FROM v_device_keys "; $sql .= "WHERE ("; @@ -471,7 +466,6 @@ include "root.php"; $sql .= "or device_profile_uuid = '".$device_profile_uuid."' "; } $sql .= ") "; - $sql .= "AND (device_key_extension = '".$vendor."' OR device_key_extension = '' OR device_key_extension is null) "; //$sql .= "AND domain_uuid = '".$domain_uuid."' "; $sql .= "ORDER BY device_key_category asc, device_key_id asc, device_uuid desc"; $prep_statement = $this->db->prepare(check_sql($sql));