From c45ff593ac5f816a166db7bde0425d73e4a40309 Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Tue, 24 Apr 2007 07:33:33 +0000
Subject: [PATCH]  - Patch #138376 by dww: fixed array vs. string bug when
 defining #default_value array for a multiselect.  Backport from HEAD.

---
 includes/form.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/form.inc b/includes/form.inc
index da75fa33533..fdaec467d9e 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -971,7 +971,7 @@ function form_select_options($element, $choices = NULL) {
     }
     else {
       $key = (string)$key;
-      if ($value_valid && ((string)$element['#value'] === $key || ($value_is_array && in_array($key, $element['#value'])))) {
+      if ($value_valid && (!$value_is_array && (string)$element['#value'] === $key || ($value_is_array && in_array($key, $element['#value'])))) {
         $selected = ' selected="selected"';
       }
       else {