From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 28 Mar 2012 19:51:09 +0000 (-0500)
Subject: FS-4049 alt patch 2
X-Git-Tag: v1.2-rc1~19^2^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1932f852ee1d294d6b2889e7fc1942c729b1bcb2;p=thirdparty%2Ffreeswitch.git

FS-4049 alt patch 2
---

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index 3b09287494..24e16eb862 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -2456,13 +2456,14 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
 		}
 
 		if (zstr(from_id)) {
-			from_id = switch_str_nil(switch_event_get_header(helper->event, "Caller-Callee-ID-Number"));
+			from_id = from_user;
 		}
 
 		if (zstr(from_id)) {
-			from_id = switch_str_nil(switch_event_get_header(helper->event, "Caller-Destination-Number"));
+			from_id = switch_str_nil(switch_event_get_header(helper->event, "Caller-Callee-ID-Number"));
 		}
 
+		
 		if (zstr(from_id)) {
 			from_id = "n/a";
 		}