From 870ec26ca97216eb321a74a586c71bda98e4bea3 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 26 Dec 2012 16:46:56 +0000
Subject: [PATCH] Fix voicemail greetings so that the text shows up correctly
 after adding the multi-lingual framework.

---
 app/voicemail_greetings/voicemail_greeting_edit.php | 4 ++--
 app/voicemail_greetings/voicemail_greetings.php     | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/voicemail_greetings/voicemail_greeting_edit.php b/app/voicemail_greetings/voicemail_greeting_edit.php
index 0877301918..5f71142282 100644
--- a/app/voicemail_greetings/voicemail_greeting_edit.php
+++ b/app/voicemail_greetings/voicemail_greeting_edit.php
@@ -26,7 +26,6 @@
 include "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
-require_once "app_languages.php";
 if (permission_exists('voicemail_greetings_add') || permission_exists('voicemail_greetings_edit')) {
 	//access granted
 }
@@ -36,7 +35,8 @@ else {
 }
 
 //add multi-lingual support
-	foreach($content_voicemail_greetings as $key => $value) {
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index b9b5f2cd0f..1eadeb67ef 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -26,7 +26,6 @@
 include "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
-require_once "app_languages.php";
 if (permission_exists('voicemail_greetings_view')) {
 	//access granted
 }
@@ -35,11 +34,14 @@ else {
 	exit;
 }
 
-        foreach($content_voicemail_greetings as $key => $value) {
+//add multi-lingual support
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
 		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
-require_once "includes/paging.php";
+//additional includes
+	require_once "includes/paging.php";
 
 //set the max php execution time
 	ini_set(max_execution_time,7200);