[svn-commits] murf: branch group/CDRfix5 r88285 - in /team/group/CDRfix5: ./ main/

[SVN commits to the Digium repositories]

Author: murf
Date: Fri Nov  2 12:13:22 2007
New Revision: 88285

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88285
Log:
Merged revisions 88267,88284 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r88267 | tilghman | 2007-11-02 10:26:31 -0600 (Fri, 02 Nov 2007) | 2 lines

Add a few bytes on LUA

................
r88284 | qwell | 2007-11-02 10:54:11 -0600 (Fri, 02 Nov 2007) | 13 lines

Merged revisions 88283 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11147)
........
r88283 | qwell | 2007-11-02 11:51:08 -0500 (Fri, 02 Nov 2007) | 4 lines

We need to make sure to specify a language to ast_fileexists, otherwise it may fail for anything besides en

Issue 11147, fix discovered by both citats and myself (independently), with input from Corydon76

........

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

Modified:
    team/group/CDRfix5/   (props changed)
    team/group/CDRfix5/CHANGES
    team/group/CDRfix5/main/say.c

Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov  2 12:13:22 2007
@@ -1,1 +1,1 @@
-/trunk:1-88254
+/trunk:1-88284

Modified: team/group/CDRfix5/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/CHANGES?view=diff&rev=88285&r1=88284&r2=88285
==============================================================================
--- team/group/CDRfix5/CHANGES (original)
+++ team/group/CDRfix5/CHANGES Fri Nov  2 12:13:22 2007
@@ -303,6 +303,8 @@
      channel in conjunction with the existing 'n' option for local channels.
   * Added support for reading the TOUCH_MONITOR_PREFIX channel variable.
      It allows you to configure a prefix for auto-monitor recordings.
+  * Added support for running your dialplan by writing one in lua.  See
+     configs/extensions.lua.sample for examples of how to do this.
 
 CDR changes
 -----------

Modified: team/group/CDRfix5/main/say.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/main/say.c?view=diff&rev=88285&r1=88284&r2=88285
==============================================================================
--- team/group/CDRfix5/main/say.c (original)
+++ team/group/CDRfix5/main/say.c Fri Nov  2 12:13:22 2007
@@ -126,7 +126,7 @@
 			fnbuf[8] = ltr;
 			fn = fnbuf;
 		}
-		if (fn && ast_fileexists(fn, NULL, NULL) > 0) {
+		if (fn && ast_fileexists(fn, NULL, lang) > 0) {
 			res = ast_streamfile(chan, fn, lang);
 			if (!res) {
 				if ((audiofd  > -1) && (ctrlfd > -1))
@@ -206,7 +206,7 @@
 			fnbuf[9] = ltr;
 			fn = fnbuf;
 		}
-		if (fn && ast_fileexists(fn, NULL, NULL) > 0) {
+		if (fn && ast_fileexists(fn, NULL, lang) > 0) {
 			res = ast_streamfile(chan, fn, lang);
 			if (!res) {
 				if ((audiofd  > -1) && (ctrlfd > -1))
@@ -256,7 +256,7 @@
 			fn = fnbuf;
 			break;
 		}
-		if (fn && ast_fileexists(fn, NULL, NULL) > 0) {
+		if (fn && ast_fileexists(fn, NULL, lang) > 0) {
 			res = ast_streamfile(chan, fn, lang);
 			if (!res) {
 				if ((audiofd  > -1) && (ctrlfd > -1))