Fix alarm preference display
authorMichael M Slusarz <slusarz@curecanti.org>
Mon, 12 Apr 2010 18:44:55 +0000 (12:44 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Mon, 12 Apr 2010 18:44:55 +0000 (12:44 -0600)
framework/Core/lib/Horde/Core/Prefs/Ui/Widgets.php

index c2a097f..6acefa5 100644 (file)
@@ -286,10 +286,14 @@ class Horde_Core_Prefs_Ui_Widgets
             'HordeAlarmPrefs.pref = ' . Horde_Serialize::serialize($pref, Horde_Serialize::JSON)
         ));
 
-        $alarm_pref = unserialize($prefs->getValue($pref));
+        $alarm_pref = unserialize($GLOBALS['prefs']->getValue($pref));
         $selected = array_keys($alarm_pref);
 
+        $t = $GLOBALS['injector']->createInstance('Horde_Template');
+        $t->setOption('gettext', true);
+
         $param_list = $select_list = array();
+
         foreach (Horde_Alarm::notificationMethods() as $method => $params) {
             $select_list[] = array(
                 'l' => $params['__desc'],
@@ -339,6 +343,7 @@ class Horde_Core_Prefs_Ui_Widgets
                                 'val' => htmlspecialchars($key)
                             );
                         }
+                        $t->set('sounds', $sounds);
 
                         $tmp['param'][] = array(
                             'sound' => true,
@@ -353,9 +358,6 @@ class Horde_Core_Prefs_Ui_Widgets
             }
         }
 
-        $base = $GLOBALS['injector']->createInstance('Horde_Template');
-        $base->setOption('gettext', true);
-
         $t->set('desc', Horde::label($pref, $data['label']));
         if (!empty($data['helplink'])) {
             $t->set('helplink', $data['helplink']);