mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-03 12:25:35 +00:00
Mismerged a bit.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@237882 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1910,7 +1910,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
|
||||
connected.id.number_presentation = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN;
|
||||
ast_channel_set_connected_line(tmp->chan, &connected);
|
||||
} else {
|
||||
ast_connected_line_copy_from_caller(&tmp->chan->connected, &chan->cid);
|
||||
ast_connected_line_copy_from_caller(&tc->connected, &chan->cid);
|
||||
}
|
||||
|
||||
S_REPLACE(tc->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis));
|
||||
|
||||
Reference in New Issue
Block a user