[svn-commits] file: trunk r45693 - in /trunk: ./ apps/app_externalivr.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Oct 19 12:22:13 2006
New Revision: 45693

URL: http://svn.digium.com/view/asterisk?rev=45693&view=rev
Log:
Merged revisions 45692 via svnmerge from 
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)

........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_externalivr.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_externalivr.c?rev=45693&r1=45692&r2=45693&view=diff
==============================================================================
--- trunk/apps/app_externalivr.c (original)
+++ trunk/apps/app_externalivr.c Thu Oct 19 12:22:13 2006
@@ -447,7 +447,7 @@
 					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 @@
 						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");