[Asterisk-code-review] res parking: Stop setting the deprecated PARKINGSLOT channel... (asterisk[master])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/10512 )

Change subject: res_parking: Stop setting the deprecated PARKINGSLOT channel variable.
......................................................................

res_parking: Stop setting the deprecated PARKINGSLOT channel variable.

Change-Id: Ia155ce2a53d61556aa4685524d1b48cfacfa3a8b
---
M UPGRADE.txt
M res/parking/parking_bridge_features.c
M res/res_parking.c
3 files changed, 3 insertions(+), 4 deletions(-)

Approvals:
  Corey Farrell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Approved for Submit



diff --git a/UPGRADE.txt b/UPGRADE.txt
index a7bf14c..a9e958f 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -30,4 +30,7 @@
 * 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 cbc23fa..f73f371 100644
--- a/res/parking/parking_bridge_features.c
+++ b/res/parking/parking_bridge_features.c
@@ -603,7 +603,6 @@
 	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 5d1b30c..fa76c48 100644
--- 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>

-- 
To view, visit https://gerrit.asterisk.org/10512
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia155ce2a53d61556aa4685524d1b48cfacfa3a8b
Gerrit-Change-Number: 10512
Gerrit-PatchSet: 5
Gerrit-Owner: Sean Bright <sean.bright at gmail.com>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2 (1000185)
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20181025/46b94fb1/attachment-0001.html>