From e17702395e1aa0fa54eea36817e1150c231d49eb Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Mon, 26 Feb 2007 06:51:39 +0000
Subject: fixed check for selected value in value array in rcube_shared::select

---
 program/include/rcube_shared.inc | 12 +++++++-----
 program/steps/mail/compose.inc   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'program')

diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index a26fc108b..ba63c825f 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -1009,20 +1009,22 @@ class select extends base_form_element
     
     if (!is_array($select))
       $select = array((string)$select);
-    
+
     foreach ($this->options as $option)
       {
-      $selected = ((!empty($option['value']) && in_array($option['value'], $select, TRUE)) ||
-                   (in_array($option['text'], $select, TRUE))) ? $this->_conv_case(' selected', 'attrib') : '';
+      $selected = ((isset($option['value']) &&
+                    in_array($option['value'], $select, TRUE)) ||
+                   (in_array($option['text'], $select, TRUE))) ?
+        $this->_conv_case(' selected', 'attrib') : '';
                   
       $options_str .= sprintf("<%s%s%s>%s</%s>\n",
                              $this->_conv_case('option', 'tag'),
-                             !empty($option['value']) ? sprintf($value_str, $option['value']) : '',
+                             isset($option['value']) ? sprintf($value_str, $option['value']) : '',
                              $selected, 
                              Q($option['text'], 'strict', FALSE),
                              $this->_conv_case('option', 'tag'));
       }
-                             
+
     // return final tag
     return sprintf('<%s%s>%s</%s>%s',
                    $this->_conv_case('select', 'tag'),
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 211f9fbe8..1c2639d9b 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -766,7 +766,7 @@ function rcmail_priority_selector($attrib)
                        rcube_label('highest')),
                  array(5, 4, 0, 2, 1));
                  
-  $sel = isset($_POST['_priority']) ? $_POST['_priority'] : rcube_label('normal');
+  $sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0;
 
   $out = $form_start ? "$form_start\n" : '';
   $out .= $selector->show($sel);
-- 
cgit v1.2.3