Changeset 497 in subversion

Timestamp:

Feb 26, 2007 1:51:39 AM (6 years ago)

Author:

estadtherr

Message:

fixed check for selected value in value array in rcube_shared::select

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_shared.inc (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2007/02/25 (estadtherr)
+----------
+- Fixed priority selector issue (#1484150)
+
 
 2007/02/21 (thomasb)

trunk/roundcubemail/program/include/rcube_shared.inc

@@ -1010 +1010 @@
     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',

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -767 +767 @@
                  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" : '';