Move Uniqueid to the end of the event for those that rely on the position

of the name/value pairs, pointed out by snuffy-home on #asterisk-commits.

For those of you who rely on the position of name/value pairs in manager
events... stop... that is why associative arrays were invented.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138482 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/features.c b/main/features.c
index 6b0627f54507eaa8d0c6f338238b6f733c3db673..90acb2b13c007baea116a173329061113e544727 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -603,16 +603,17 @@ static int ast_park_call_full(struct ast_channel *chan, struct ast_channel *peer
        manager_event(EVENT_FLAG_CALL, "ParkedCall",
                "Exten: %s\r\n"
                "Channel: %s\r\n"
-               "Uniqueid: %s\r\n"
                "Parkinglot: %s\r\n"
                "From: %s\r\n"
                "Timeout: %ld\r\n"
                "CallerIDNum: %s\r\n"
-               "CallerIDName: %s\r\n",
-               pu->parkingexten, pu->chan->name, pu->chan->uniqueid, pu->parkinglot->name, peer ? peer->name : "",
+               "CallerIDName: %s\r\n"
+               "Uniqueid: %s\r\n",
+               pu->parkingexten, pu->chan->name, pu->parkinglot->name, peer ? peer->name : "",
                (long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
                S_OR(pu->chan->cid.cid_num, "<unknown>"),
-               S_OR(pu->chan->cid.cid_name, "<unknown>")
+               S_OR(pu->chan->cid.cid_name, "<unknown>"),
+               pu->chan->uniqueid
                );
 
        if (peer && adsipark && ast_adsi_available(peer)) {