From c7c9b57ec25791bcbe47b991fd6aa3dd528a2a3b Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Wed, 15 Mar 2006 08:57:37 +0000
Subject: #53967, form_builder checkbox/textfield/validation stuff, patch by
 hunmonk and chx

---
 includes/form.inc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'includes')

diff --git a/includes/form.inc b/includes/form.inc
index e028edbd7..b0345d638 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -325,14 +325,16 @@ function form_builder($form_id, $form) {
       if ($posted) {
         switch ($form['#type']) {
           case 'checkbox':
-            $form['#value'] = isset($edit) ? $form['#return_value'] : 0;
+            $form['#value'] = !empty($edit) ? $form['#return_value'] : 0;
             break;
           case 'select':
             $form['#value'] = isset($edit) ? $edit : array();
             break;
           case 'textfield':
             if (isset($edit)) {
-              $form['#value'] = str_replace(array("\r", "\n"), '', $edit);
+              // Equate $edit to the form value to ensure it's marked for validation
+              $edit = str_replace(array("\r", "\n"), '', $edit);
+              $form['#value'] = $edit;
             }
             break;
           default:
@@ -340,7 +342,8 @@ function form_builder($form_id, $form) {
               $form['#value'] = $edit;
             }
         }
-        if (isset($form['#value'])) {
+        // Mark all posted values for validation
+        if (isset($form['#value']) && $form['#value'] === $edit) {
           $form['#needs_validation'] = TRUE;
         }
       }
-- 
cgit v1.2.3