Changeset 8389

Timestamp:

09/10/09 13:41:56 (4 years ago)

Author:

p_lindheimer

Message:

fixes #3886 and re #3875 devices were not being deleted from #3875 fixes

Files:

• modules/branches/2.6/core/functions.inc.php (modified) (3 diffs)
• modules/branches/2.6/core/module.xml (modified) (2 diffs)

modules/branches/2.6/core/functions.inc.php

@@ -2650 +2650 @@
-  global $astman;
-  global $db;
+
+  if ($tech == '' || trim($tech) == 'virtual') {
+    return true;
+  }
-  
-  $display = isset($_REQUEST['display'])?$_REQUEST['display']:'';
@@ -2778 +2782 @@
-  global $currentFile;
-  global $astman;
-
+
-  //get all info about device
-  $devinfo = core_devices_get($account);
-
+
+
+
+
-  //delete details to astdb
-  if ($astman) {
@@ -5391 +5398 @@
-  
-  //create vars from the request
+  $tech = $action = null;
-  extract($_REQUEST);
-
-
-
+
+
+
-  $extension = isset($extension)?$extension:null;
-  $deviceid = isset($deviceid)?$deviceid:null;

modules/branches/2.6/core/module.xml

@@ -4 +4 @@
-  <category>Basic</category>
-  <name>Core</name>
-0
+1
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -10 +10 @@
-  <canuninstall>no</canuninstall>
-  <changelog>
+    *2.6.0RC2.1* #3886, #3885, #3875 revisited
-    *2.6.0RC2.0* #3854, #3872, #3871, #3877
-    *2.6.0RC1.1* #3751