Changeset 9694 for modules

Show
Ignore:
Timestamp:
05/24/10 16:28:20 (3 years ago)
Author:
p_lindheimer
Message:

Merged revisions 9607 via svnmerge from
http://svn.freepbx.org/modules/branches/2.8

........

r9607 | p_lindheimer | 2010-05-11 11:08:47 -0700 (Tue, 11 May 2010) | 1 line


fixes #4262 use amp_conf in place of asterisk_conf to get path information

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.7

    • Property svnmerge-integrated changed from /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508 to /modules/branches/2.6:1-8497,8589,8613,8620,8651,8672,9414-9416 /modules/branches/2.8:1-9044,9047,9049-9054,9056-9070,9072-9073,9075,9079-9080,9082-9085,9088-9089,9092-9093,9095-9098,9102,9105,9107-9123,9127-9128,9130-9132,9137,9149-9204,9211-9214,9216,9218-9224,9230-9232,9234,9237-9239,9248-9252,9257-9262,9267-9270,9272-9274,9277-9278,9280,9282,9288-9292,9295,9297,9300-9324,9326-9327,9329-9342,9345-9349,9353-9354,9358,9363-9376,9378-9379,9385,9387-9389,9392-9393,9395-9405,9407-9408,9410,9414-9421,9423-9424,9440,9442,9446-9449,9451-9452,9454-9458,9460-9462,9464-9469,9474-9475,9483-9484,9486,9489,9495,9500-9502,9504,9508,9607

  • modules/branches/2.7/recordings/install.php

    r6897 r9694  
    88 
    99global $amp_conf; 
    10 global $asterisk_conf; 
    1110global $db; 
    1211 
    …… 
    2322} 
    2423 
    25 $recordings_astsnd_path = isset($asterisk_conf['astvarlibdir'])?$asterisk_conf['astvarlibdir']:'/var/lib/asterisk'; 
     24$recordings_astsnd_path = isset($amp_conf['ASTVARLIBDIR'])?$amp_conf['ASTVARLIBDIR']:'/var/lib/asterisk'; 
    2625$recordings_astsnd_path .= "/sounds/"; 
    2726$autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT"; 

  • modules/branches/2.7/recordings/module.xml

    r8993 r9694  
    22  <rawname>recordings</rawname> 
    33  <name>Recordings</name> 
    4   <version>3.3.9.4</version> 
     4  <version>3.3.9.5</version> 
    55  <publisher>FreePBX</publisher> 
    66  <license>GPLv2+</license> 
    …… 
    1111  <description>Creates and manages system recordings, used by many other modules (eg, IVR).</description> 
    1212  <changelog> 
     13    *3.3.9.5* #4262 
    1314    *3.3.9.4* localizations 
    1415    *3.3.9.3* #3529