From 0591c9d76f6021cb04026ca85a5d3af3dd25e4f8 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 12 Sep 2011 13:16:34 -0400
Subject: [PATCH] CC-2790: Stream type "OGG" should be "OGG/VORBIS"

- fixed
---
 .../application/controllers/PreferenceController.php       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 6bccbf697..35c4df074 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -137,7 +137,12 @@ class PreferenceController extends Zend_Controller_Action
         $temp_types = Application_Model_Preference::GetStreamType();
         $stream_types = array();
         foreach ($temp_types as $type){
-            $stream_types[trim($type)] = strtoupper(trim($type));
+            if(trim($type) == "ogg"){
+                $temp = "OGG/VORBIS";
+            }else{
+                $temp = strtoupper(trim($type));
+            }
+            $stream_types[trim($type)] = $temp;
         }
         
         $temp_bitrate = Application_Model_Preference::GetStreamBitrate();