Changeset 5190

Show
Ignore:
Timestamp:
11/02/07 19:04:25 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5179,5181 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5179 | p_lindheimer | 2007-10-30 11:08:04 -0700 (Tue, 30 Oct 2007) | 1 line


#2312 fix dictate in devicesandusers mode

........

r5181 | p_lindheimer | 2007-10-30 11:14:08 -0700 (Tue, 30 Oct 2007) | 1 line


fixed typo in default setting

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097,5103,5109,5114,5120,5125-5126,5169 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097,5103,5109,5114,5120,5125-5126,5169,5179,5181

  • modules/branches/2.3/dictate/functions.inc.php

    r4041 r5190  
    2222          } else { 
    2323            $ext->add('from-internal-additional', 'debug', '', new ext_noop($modulename.": No func $fname")); 
    24             var_dump($item); 
    2524          }  
    2625        } 
    …… 
    8584  if ($tech_hardware != null || $pagename == 'users') { 
    8685    dictation_applyhooks(); 
     86    $currentcomponent->addprocessfunc('dictate_configprocess', 5); 
    8787  } elseif ($action=="add") { 
    8888    // We don't need to display anything on an 'add', but we do need to handle returned data. 
    …… 
    168168  if (!$ena) { $ena = "disabled"; } 
    169169  // Default format is ogg 
    170   if (!$format) { $foramt = "ogg"; } 
     170  if (!$format) { $format = "ogg"; } 
    171171 
    172172  return array('enabled' => $ena, 'format' => $format, 'email' => $email); 

  • modules/branches/2.3/dictate/module.xml

    r4942 r5190  
    22  <rawname>dictate</rawname> 
    33  <name>Dictation</name> 
    4   <version>1.1.2.2</version> 
     4  <version>1.1.2.3</version> 
    55  <type>setup</type> 
    66  <category>Internal Options &amp; Configuration</category> 
    77  <changelog> 
     8    *1.1.2.3* #2312 fix dictate in devicesandusers mode 
    89    *1.1.2.2* changed categories 
    910    *1.1.2.1* bump for rc1