respect 'usecallingpres' in zapata.conf even if CLID has not been set for the channel (issue #7123)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@29969 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · 84790a577b
parent 76066c2b74
commit 84790a577b
1 changed files with 2 additions and 3 deletions
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@ -2119,9 +2119,8 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
 				prilocaldialplan = PRI_LOCAL_ISDN;
 			}
 		}
-		pri_sr_set_caller(sr, l ? (l + ldp_strip) : NULL, n, prilocaldialplan, 
-					l ? (p->use_callingpres ? ast->cid.cid_pres : PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN) : 
-						 PRES_NUMBER_NOT_AVAILABLE);
+		pri_sr_set_caller(sr, l ? (l + ldp_strip) : NULL, n, prilocaldialplan,
+				  p->use_callingpres ? ast->cid.cid_pres : (l ? PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN : PRES_NUMBER_NOT_AVAILABLE));
 		pri_sr_set_redirecting(sr, ast->cid.cid_rdnis, p->pri->localdialplan - 1, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, PRI_REDIR_UNCONDITIONAL);

 #ifdef SUPPORT_USERUSER