[asterisk-commits] moy: trunk r309721 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: moy
Date: Sat Mar  5 11:53:31 2011
New Revision: 309721

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309721
Log:
Merged revisions 309720 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r309720 | moy | 2011-03-05 12:44:30 -0500 (Sat, 05 Mar 2011) | 6 lines
  
  Fix caller id passed to openr2_chan_make_call
  
  (closes issue #18894)
  Reported by: malufrj
  Tested by: moy
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

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

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=309721&r1=309720&r2=309721
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Sat Mar  5 11:53:31 2011
@@ -5394,7 +5394,7 @@
 
 		c = args.ext;
 		if (!p->hidecallerid) {
-			l = ast->caller.id.number.valid ? ast->caller.id.number.str : NULL;
+			l = ast->connected.id.number.valid ? ast->connected.id.number.str : NULL;
 		} else {
 			l = NULL;
 		}