Merged revisions 45692 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Thu, 19 Oct 2006 17:22:13 +0000 (17:22 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 19 Oct 2006 17:22:13 +0000 (17:22 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45692 | file | 2006-10-19 13:19:47 -0400 (Thu, 19 Oct 2006) | 10 lines

Merged revisions 45691 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45691 | file | 2006-10-19 13:16:37 -0400 (Thu, 19 Oct 2006) | 2 lines

Respect language selection when seeing if the file exists (issue #8178 reported by mnicholson)

........

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

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

apps/app_externalivr.c

index 3ce1563..5d2ba1f 100644 (file)
@@ -447,7 +447,7 @@ static int app_exec(struct ast_channel *chan, void *data)
                                        continue;
 
                                if (input[0] == 'S') {
-                                       if (ast_fileexists(&input[2], NULL, NULL) == -1) {
+                                       if (ast_fileexists(&input[2], NULL, u->chan->language) == -1) {
                                                ast_chan_log(LOG_WARNING, chan, "Unknown file requested '%s'\n", &input[2]);
                                                send_child_event(child_events, 'Z', NULL, chan);
                                                strcpy(&input[2], "exception");
@@ -466,7 +466,7 @@ static int app_exec(struct ast_channel *chan, void *data)
                                                AST_LIST_INSERT_TAIL(&u->playlist, entry, list);
                                        AST_LIST_UNLOCK(&u->playlist);
                                } else if (input[0] == 'A') {
-                                       if (ast_fileexists(&input[2], NULL, NULL) == -1) {
+                                       if (ast_fileexists(&input[2], NULL, u->chan->language) == -1) {
                                                ast_chan_log(LOG_WARNING, chan, "Unknown file requested '%s'\n", &input[2]);
                                                send_child_event(child_events, 'Z', NULL, chan);
                                                strcpy(&input[2], "exception");