Merged revisions 88283 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 2 Nov 2007 16:54:11 +0000 (16:54 +0000)
committerJason Parker <jparker@digium.com>
Fri, 2 Nov 2007 16:54:11 +0000 (16:54 +0000)
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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88284 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/say.c

index f0e30cd..92ce230 100644 (file)
@@ -126,7 +126,7 @@ static int say_character_str_full(struct ast_channel *chan, const char *str, con
                        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 @@ static int say_phonetic_str_full(struct ast_channel *chan, const char *str, cons
                        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 @@ static int say_digit_str_full(struct ast_channel *chan, const char *str, const c
                        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))