From eb7d6f05ffe630f74a964ae7713fcd4432cdfdde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Mon, 28 Jan 2008 00:15:34 +0000
Subject: #206955 follow up by merlinofchaos: avoid misusing default values for
 image buttons

---
 includes/form.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/form.inc b/includes/form.inc
index 9a28ddf73..2f84e69d4 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -985,7 +985,9 @@ function _form_builder_handle_input_element($form_id, &$form, &$form_state, $com
         $form['#value'] = $function($form);
       }
       // Final catch. If we haven't set a value yet, use the explicit default value.
-      if (!isset($form['#value'])) {
+      // Avoid image buttons (which come with garbage value), so we only get value
+      // for the button actually clicked.
+      if (!isset($form['#value']) && empty($form['#has_garbage_value'])) {
         $form['#value'] = isset($form['#default_value']) ? $form['#default_value'] : '';
       }
     }
-- 
cgit v1.2.3