From 2d1c83eee53c257fe2b022e799f7ac89d100e75b Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Mon, 26 Aug 2013 22:40:25 +0000
Subject: [PATCH] Custom variables belong under the global dialplan or global
 (meaning global per tenant) could be renamed to variables. Would be better to
 set under system -> variables -> transfer_ringback.

---
 .../resources/switch/conf/dialplan/250_global.xml         | 1 +
 .../switch/conf/dialplan/50_custom-variables.xml          | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 app/dialplan/resources/switch/conf/dialplan/50_custom-variables.xml

diff --git a/app/dialplan/resources/switch/conf/dialplan/250_global.xml b/app/dialplan/resources/switch/conf/dialplan/250_global.xml
index 91f7f4d3c2..e0fcec76b2 100644
--- a/app/dialplan/resources/switch/conf/dialplan/250_global.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/250_global.xml
@@ -1,6 +1,7 @@
 <context name="{v_context}">
 	<extension name="global" continue="true" app_uuid="34dd307b-fffe-4ead-990c-3d070e288126">
 		<condition>
+			<action application="export" data="origination_callee_id_name=${destination_number}"/>
 			<action application="set" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
 		</condition>
 	</extension>
diff --git a/app/dialplan/resources/switch/conf/dialplan/50_custom-variables.xml b/app/dialplan/resources/switch/conf/dialplan/50_custom-variables.xml
deleted file mode 100644
index 7be30fa6d9..0000000000
--- a/app/dialplan/resources/switch/conf/dialplan/50_custom-variables.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<context name="{v_context}">
-	<extension name="custom-variables" continue="true" app_uuid="7e0bbdd7-be74-4019-bc5d-2bb9fd0fdb89">
-		<condition field="context" expression="^.*$">
-			<action application="export" data="origination_callee_id_name=${destination_number}"/>
-			<action application="export" data="transfer_ringback=$${uk-ring}"/>
-		</condition>
-	</extension>
-</context>