- Patch #162708 by Eaton and Earl: add support for image buttons to FAPI3.

  This is a small form API extension (doesn't break existing code) that
  facilitates the Drupal 6 upgrade of the Views module.  A good example
  of why it can be beneficial to start upgrading your modules early on in
  the code freeze. ;)

4 files changed, 7 insertions, 6 deletions

diff --git a/modules/forum/forum-submitted.tpl.php b/modules/forum/forum-submitted.tpl.php
index 79580c3aa..747cf8375 100644
--- a/modules/forum/forum-submitted.tpl.php
+++ b/modules/forum/forum-submitted.tpl.php
@@ -1,10 +1,10 @@
-<?php 
+<?php
 // $Id$
 /**
  * @file forum-submitted.tpl.php
  * Default theme implementation to format a simple string indicated when and
  * by whom a topic was submitted.
- * 
+ *
  * Available variables:
  *
  * - $author: The author of the post.
@@ -19,7 +19,7 @@
 <?php if ($time): ?>
   <?php print t(
   '@time ago<br />by !author', array(
-    '@time' => $time, 
+    '@time' => $time,
     '!author' => $author,
     )); ?>
 <?php else: ?>
diff --git a/modules/forum/forums.tpl.php b/modules/forum/forums.tpl.php
index 1b8264a72..0b8e1dfb6 100644
--- a/modules/forum/forums.tpl.php
+++ b/modules/forum/forums.tpl.php
@@ -1,4 +1,4 @@
-<?php // $Id$ 
+<?php // $Id$
 /**
  * @file forums.tpl.php
  * Default theme implementation to display a forum, which may contain forum
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index cc72f8ac9..abe5889d5 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -478,7 +478,7 @@ function menu_delete_menu_confirm(&$form_state, $menu) {
   if ($num_links) {
     $caption .= '<p>'. format_plural($num_links, '<strong>Warning:</strong> There is currently 1 menu item in %title. It will be deleted (system-defined items will be reset).', '<strong>Warning:</strong> There are currently @count menu items in %title. They will be deleted (system-defined items will be reset).', array('%title' => $menu['title'])) .'</p>';
   }
-  $caption .= '<p>'. t('This action cannot be undone.') .'</p>';  
+  $caption .= '<p>'. t('This action cannot be undone.') .'</p>';
   return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/build/menu-customize/'. $menu['menu_name'], $caption, t('Delete'));
 }
 
diff --git a/modules/system/system.module b/modules/system/system.module
index 0ebaaea51..c856ea930 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -105,6 +105,7 @@ function system_elements() {
   // Inputs
   $type['submit'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => TRUE, '#ahah_event' => 'submit', '#process' => array('form_expand_ahah'));
   $type['button'] = array('#input' => TRUE, '#name' => 'op', '#button_type' => 'submit', '#executes_submit_callback' => FALSE, '#ahah_event' => 'submit', '#process' => array('form_expand_ahah'));
+  $type['image_button'] = array('#input' => TRUE, '#button_type' => 'submit','#executes_submit_callback' => TRUE, '#ahah_event' => 'submit', '#process' => array('form_expand_ahah'), '#has_garbage_value' => TRUE, '#image' => NULL);
   $type['textfield'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128, '#autocomplete_path' => FALSE);
   $type['password'] = array('#input' => TRUE, '#size' => 60, '#maxlength' => 128);
   $type['password_confirm'] = array('#input' => TRUE, '#process' => array('expand_password_confirm'));
@@ -3126,4 +3127,4 @@ function system_goto_action_submit($form, $form_state) {
 
 function system_goto_action($object, $context) {
   drupal_goto($context['url']);
-}
\ No newline at end of file
+}