FS-4049 alt patch 2

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";
 		}