Show
Ignore:
Timestamp:
10/31/08 18:37:12 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 7186-7201 via svnmerge from
http://svn.freepbx.org/modules/branches/2.5

........

r7193 | mickecarlsson | 2008-10-30 12:55:49 -0700 (Thu, 30 Oct 2008) | 1 line


Closes #3351 adds spanish langauge to conferences. Thank you lucas

........

r7195 | mickecarlsson | 2008-10-30 14:40:26 -0700 (Thu, 30 Oct 2008) | 1 line


Closes #3352 adds spanish language to cidlookup. Thanks lucas

........

r7197 | mickecarlsson | 2008-10-30 23:26:23 -0700 (Thu, 30 Oct 2008) | 1 line


Fixed type in code for fw_fop

........

r7198 | mickecarlsson | 2008-10-31 12:39:14 -0700 (Fri, 31 Oct 2008) | 1 line


Closes #3354 adds spanish language to daynight. Thank you lucas

........

r7199 | mickecarlsson | 2008-10-31 12:48:34 -0700 (Fri, 31 Oct 2008) | 1 line


Added translated swedish speeddial.po to speeddial

........

r7200 | p_lindheimer | 2008-10-31 15:29:51 -0700 (Fri, 31 Oct 2008) | 1 line


fix publishing tool to check for php errors in framework modules

........

r7201 | p_lindheimer | 2008-10-31 15:32:14 -0700 (Fri, 31 Oct 2008) | 1 line


Module Publish Script: fw_fop 2.5.0.1

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7185 to /modules/branches/2.5:1-7201
  • modules/branches/2.6/publish.pl

    r7087 r7202  
    219219      next if ($x =~ /svnversion.txt/); 
    220220      $files .= "$x "; 
     221      if (-f $x && $checkphp) { 
     222        if (system("php -l $x")) { 
     223          die "FATAL: php syntax error detected in $x\n"; 
     224        } 
     225      } 
    221226    } 
    222227  } elsif ($moddir =~ /$fw_fop/) { 
     228    while ($x = shift @arr) { 
    223229      next if ($x =~ /module.xml/); 
    224230      next if ($x =~ /htdocs_panel/); 
    225231      next if ($x =~ /svnversion.txt/); 
    226232      $files .= "$x "; 
     233      if (-f $x && $checkphp) { 
     234        if (system("php -l $x")) { 
     235          die "FATAL: php syntax error detected in $x\n"; 
     236        } 
     237      } 
     238    } 
    227239  } elsif ($moddir =~ /$fw_ari/) { 
     240    while ($x = shift @arr) { 
    228241      next if ($x =~ /module.xml/); 
    229242      next if ($x =~ /htdocs_ari/); 
    230243      next if ($x =~ /svnversion.txt/); 
    231244      $files .= "$x "; 
     245      if (-f $x && $checkphp) { 
     246        if (system("php -l $x")) { 
     247          die "FATAL: php syntax error detected in $x\n"; 
     248        } 
     249      } 
     250    } 
    232251  } elsif ($moddir =~ /$fw_langpacks/) { 
     252    while ($x = shift @arr) { 
    233253      next if ($x =~ /module.xml/); 
    234254      next if ($x =~ /htdocs/); 
    235255      next if ($x =~ /svnversion.txt/); 
    236256      $files .= "$x "; 
     257      if (-f $x && $checkphp) { 
     258        if (system("php -l $x")) { 
     259          die "FATAL: php syntax error detected in $x\n"; 
     260        } 
     261      } 
     262    } 
    237263  } else { 
    238264    while ($x = shift @arr) {