res_parking: Stop setting the deprecated PARKINGSLOT channel variable.

Change-Id: Ia155ce2a53d61556aa4685524d1b48cfacfa3a8b

diff --git a/UPGRADE.txt b/UPGRADE.txt
index a7bf14ccfbbdbbcfb9086f95abd0d31e61329a1c..a9e958f93c7d7767cbf6b8406f473bff95419bd8 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -30,4 +30,7 @@ New in 17.0.0:
 * The CALLERPRES() dialplan function, deprecated in Asterisk 1.8, has been
   removed.
 
+* The PARKINGSLOT channel variable, deprecated in Asterisk 12 in favor of the
+  PARKING_SPACE channel variable, will no longer be set.
+
 * The JabberStatus application, deprecated in Asterisk 12, has been removed.

diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c
index cbc23fac1b2e34590eba1e75942ea3595f582ee5..f73f37157ef56fdd8a8a39a92659284fa3d38db6 100644 (file)
--- a/res/parking/parking_bridge_features.c
+++ b/res/parking/parking_bridge_features.c
@@ -603,7 +603,6 @@ static int parking_duration_callback(struct ast_bridge_channel *bridge_channel,
        ast_channel_lock(chan);
        ast_channel_stage_snapshot(chan);
        pbx_builtin_setvar_helper(chan, "PARKING_SPACE", parking_space);
-       pbx_builtin_setvar_helper(chan, "PARKINGSLOT", parking_space); /* Deprecated version of PARKING_SPACE */
        pbx_builtin_setvar_helper(chan, "PARKEDLOT", user->lot->name);
        pbx_builtin_setvar_helper(chan, "PARKER", dial_string);
        pbx_builtin_setvar_helper(chan, "PARKER_FLAT", dial_string_flat);

diff --git a/res/res_parking.c b/res/res_parking.c
index 5d1b30c2305792a04c6e525e923aab6706de35d6..fa76c480686cfbba9047fafd05e915a81bb8b82f 100644 (file)
--- a/res/res_parking.c
+++ b/res/res_parking.c
@@ -149,9 +149,6 @@
                                                        <variable name="PARKING_SPACE">
                                                                <para>extension that the call was parked in prior to timing out.</para>
                                                        </variable>
-                                                       <variable name="PARKINGSLOT">
-                                                               <para>Deprecated.  Use <variable>PARKING_SPACE</variable> instead.</para>
-                                                       </variable>
                                                        <variable name="PARKEDLOT">
                                                                <para>name of the lot that the call was parked in prior to timing out.</para>
                                                        </variable>