Changeset 5829

Show
Ignore:
Timestamp:
06/25/08 20:18:50 (4 months ago)
Author:
p_lindheimer
Message:

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

................

r5828 | p_lindheimer | 2008-06-25 20:13:50 -0700 (Wed, 25 Jun 2008) | 9 lines


Merged revisions 5827 via svnmerge from
http://svn.freepbx.org/freepbx/trunk


........

r5827 | p_lindheimer | 2008-06-25 20:10:12 -0700 (Wed, 25 Jun 2008) | 1 line


#2862: spaces/tabs at end of asterisk.conf variables end up in path names and create failures

........

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/branches/2.3

    • Property svnmerge-integrated changed from /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/branches/2.4:1-5454,5492,5517,5648,5656,5710 to /freepbx/branches/2.2:1-4145,4434,4437 /freepbx/branches/2.4:1-5454,5492,5517,5648,5656,5710,5828
  • freepbx/branches/2.3/amp_conf/htdocs/admin/functions.inc.php

    r5711 r5829  
    136136        foreach ($file as $line) { 
    137137                if (preg_match("/^\s*([a-zA-Z0-9]+)\s* => \s*(.*)\s*([;#].*)?/",$line,$matches)) {  
    138                         $conf[ $matches[1] ] = rtrim($matches[2],'/'); 
     138                        $conf[ $matches[1] ] = rtrim($matches[2],"/ \t"); 
    139139                } 
    140140        } 
Donate



Support
Download
Develop
Forums
News
Documentation
Paid Support
About

Paid Ads