Changeset 12933

Show
Ignore:
Timestamp:
11/06/11 14:32:37 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 12932 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.10

........

r12932 | p_lindheimer | 2011-11-06 11:27:52 -0800 (Sun, 06 Nov 2011) | 1 line


fixes #5122 don't mkdir if it's already there so an eroneous error does not get reported

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.9

    • Property svnmerge-integrated changed from /freepbx/branches/2.10:1-12618 /freepbx/branches/2.8:1-11479,12035 to /freepbx/branches/2.10:1-12618,12932 /freepbx/branches/2.8:1-11479,12035

  • freepbx/branches/2.9/amp_conf/bin/retrieve_conf

    r12205 r12933  
    206206    set_error_handler("report_errors"); 
    207207      //if were copying a directory, just mkdir the directory 
    208     if (!is_link($dest)) { 
     208   if (!is_link($dest) && !is_dir($dest)) { 
    209209      if(is_dir($source)){ 
    210210        $ret = mkdir($dest,0754);