Changeset 8112

Show
Ignore:
Timestamp:
08/23/09 23:20:22 (2 years ago)
Author:
p_lindheimer
Message:

closes #3636 improved implementation of resetall

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8090 r8112  
    29052905      // If a user is selected, add this device to the user 
    29062906      if ($user != "none") { 
    2907           $existingdevices = $astman->database_get("AMPUSER",$user."/device"); 
    2908           if (!empty($existingdevices)) { 
    2909               $existingdevices .= "&"; 
    2910           } 
    2911           $astman->database_put("AMPUSER",$user."/device",$existingdevices.$id); 
    2912       } 
     2907          $existingdevices = $astman->database_get("AMPUSER",$user."/device"); 
     2908          if (empty($existingdevices)) { 
     2909            $astman->database_put("AMPUSER",$user."/device",$id); 
     2910          } else { 
     2911            $existingdevices_array = explode('&',$existingdevices); 
     2912            if (!in_array($id, $existingdevices_array)) { 
     2913              $existingdevices_array[]=$id; 
     2914              $existingdevices = implode('&',$existingdevices_array); 
     2915              $astman->database_put("AMPUSER",$user."/device",$existingdevices); 
     2916            } 
     2917          } 
     2918        } 
     2919 
    29132920       
    29142921      // create a voicemail symlink if needed 

  • modules/branches/2.6/core/module.xml

    r8086 r8112  
    44  <category>Basic</category> 
    55  <name>Core</name> 
    6   <version>2.6.0beta1.3</version> 
     6  <version>2.6.0beta1.4</version> 
    77  <publisher>FreePBX</publisher> 
    88  <license>GPLv2+</license> 
    …… 
    1010  <canuninstall>no</canuninstall> 
    1111  <changelog> 
    12     *2.6.0beta1.4* #3075, #3501 
     12    *2.6.0beta1.4* #3075, #3501, #3636 
    1313    *2.6.0beta1.3* trunk tab improvements 
    1414    *2.6.0beta1.2* added more sql escape in devices