From d2fddb47632e167d350395dbe20190d887afe388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Wed, 2 Jan 2008 15:18:15 +0000
Subject: #201017 by chx: AHAH callbacks were not working for regular buttons

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

(limited to 'includes')

diff --git a/includes/form.inc b/includes/form.inc
index 5ff0193fe..f7fdda438 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1746,7 +1746,7 @@ function form_expand_ahah($element) {
       'effect'   => empty($element['#ahah']['effect']) ? 'none' : $element['#ahah']['effect'],
       'method'   => empty($element['#ahah']['method']) ? 'replace' : $element['#ahah']['method'],
       'progress' => empty($element['#ahah']['progress']) ? array('type' => 'throbber') : $element['#ahah']['progress'],
-      'button'   => $element['#type'] == 'submit' ? array($element['#name'] => $element['#value']) : FALSE,
+      'button'   => isset($element['#executes_submit_callback']) ? array($element['#name'] => $element['#value']) : FALSE,
     );
 
     // Convert a simple #ahah[progress] type string into an array.
-- 
cgit v1.2.3