Changeset 5645 for modules/branches

Show
Ignore:
Timestamp:
02/02/08 15:25:03 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5644 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5644 | p_lindheimer | 2008-02-02 12:22:56 -0800 (Sat, 02 Feb 2008) | 1 line


redirect error to stdout when copying uploaded sound files so any error messages from failed copies will be captured and printed in the error report

........

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-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544,5572,5606-5608,5615 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-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544,5572,5606-5608,5615,5644

  • modules/branches/2.3/recordings/page.recordings.php

    r4898 r5645  
    7474        echo "make sure you uploaded or recorded a file with the entered extension<hr>"; 
    7575      } else { 
    76         exec("cp " . $recordings_save_path . "{$dest}ivrrecording.$suffix " . $astsnd."custom/{$filename}.$suffix", $outarray, $ret); 
     76        exec("cp " . $recordings_save_path . "{$dest}ivrrecording.$suffix " . $astsnd."custom/{$filename}.$suffix 2>&1", $outarray, $ret); 
    7777        if (!$ret) { 
    7878          $isok = recordings_add($rname, "custom/{$filename}.$suffix");