Merged revisions 235822 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r235822 | tilghman | 2009-12-21 11:00:46 -0600 (Mon, 21 Dec 2009) | 15 lines
  
  Merged revisions 235821 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r235821 | tilghman | 2009-12-21 10:45:03 -0600 (Mon, 21 Dec 2009) | 8 lines
    
    Send parking lot announcement to the channel which parked the call, not the park-ee.
    (closes issue #16234)
     Reported by: yeshuawatso
     Patches: 
           20091210__issue16234.diff.txt uploaded by tilghman (license 14)
           20091221__issue16234__1.4.diff.txt uploaded by tilghman (license 14)
     Tested by: yeshuawatso
  ........
................


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

main/features.c

@@ -430,7 +430,7 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan)
 	/* Lock parking lot */
 	AST_LIST_LOCK(&parkinglot);
 	/* Check for channel variable PARKINGEXTEN */
-	parkingexten = pbx_builtin_getvar_helper(chan, "PARKINGEXTEN");
+	parkingexten = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "PARKINGEXTEN"), ""));
 	if (!ast_strlen_zero(parkingexten)) {
 		/*!\note The API forces us to specify a numeric parking slot, even
 		 * though the architecture would tend to support non-numeric extensions
@@ -649,7 +649,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
 	}
 
 	if (!play_announcement && !orig_chan_name) {
-		orig_chan_name = ast_strdupa(chan->name);
+		orig_chan_name = ast_strdupa(peer->name);
 	}
 
 	park_status = park_call_full(chan, peer, timeout, extout, orig_chan_name, pu);