From d5a74370ef16af4514d3b9d01983ba3f7b1efb41 Mon Sep 17 00:00:00 2001
From: pboling
Date: Thu, 22 Oct 2009 13:38:16 -0400
Subject: merge mlc/master

---
 lib/sms_fu_helper.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/sms_fu_helper.rb b/lib/sms_fu_helper.rb
index 9f44a9c..83b292e 100644
--- a/lib/sms_fu_helper.rb
+++ b/lib/sms_fu_helper.rb
@@ -2,7 +2,7 @@ module SMSFuHelper
   # Returns a collection of carriers to be used in your own select tag
   # e.g., <%= f.select :mobile_carrier, carrier_collection %>
   def carrier_collection
-    SMSFu.carriers.sort.collect{ |carrier| [carrier[1]["name"], carrier[0]] }
+    SMSFu.carriers.sort.collect{ |carrier| [carrier[1]["name"], [carrier[1]["value"]] }
   end
   
   # Returns a formatted select box filled with carriers
@@ -14,7 +14,4 @@ module SMSFuHelper
     select_tag name, options_for_select([phrase,nil]+carrier_collection, selected || phrase)
   end
 
-  def carrier_select_default(name = :mobile_carrier, default = nil)
-    select_tag name, options_for_select([nil]+carrier_collection, default)
-  end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3