mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-24 13:50:08 +00:00
Change all instances of "CALLERID(number)" to "CALLERID(num)" for
consistency's sake (closes issue #11381, reported and patched by jon) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89621 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1957,7 +1957,7 @@ macro std-priv-exten( dev, ext , timeout, opts, torcont, dontcont )
|
||||
|
||||
macro fillcidname()
|
||||
{
|
||||
if( "${CALLERID(number)}" = "" ) // nothing to work with, quit!!!
|
||||
if( "${CALLERID(num)}" = "" ) // nothing to work with, quit!!!
|
||||
return;
|
||||
Set(cidn=${DB(cidname/${CALLERID(num)})});
|
||||
if( "${CALLERID(name)}" != "" )
|
||||
@@ -1965,7 +1965,7 @@ macro fillcidname()
|
||||
if( ("${cidn}" = "Privacy Manager" & "${CALLERID(name)}" != "Privacy Manager") | "${cidn}" = "" ) // if the entry isn't in the database,
|
||||
// or if an entry exists, and it's "Privacy Manager", empty, (or add other useless possibilities).
|
||||
{
|
||||
Set(DB(cidname/${CALLERID(number)})=${CALLERID(name)}); // then set or override what's in the DB
|
||||
Set(DB(cidname/${CALLERID(num)})=${CALLERID(name)}); // then set or override what's in the DB
|
||||
}
|
||||
}
|
||||
// Now, we fill in the callerid info from the incoming entry, if it's stuff worth using
|
||||
|
||||
Reference in New Issue
Block a user