From 7e1527ee61bc10b3765b95b9af8faaa2254da5a8 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 7 Oct 2005 06:11:12 +0000
Subject: - Patch #29465: new form API by Adrian et al.

  TODO:
  + The contact.module was broken; a new patch for contact.module is needed.
  + Documentation is needed.
  + The most important modules need to be updated ASAP.
---
 themes/bluemarine/page.tpl.php                | 7 +------
 themes/engines/phptemplate/phptemplate.engine | 5 +----
 themes/pushbutton/page.tpl.php                | 9 +--------
 3 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'themes')

diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php
index 0625a4655..f2d3b19e7 100644
--- a/themes/bluemarine/page.tpl.php
+++ b/themes/bluemarine/page.tpl.php
@@ -20,12 +20,7 @@
     <td id="menu">
       <?php if ($secondary_links) { ?><div id="secondary"><?php print theme('links', $secondary_links) ?></div><?php } ?>
       <?php if ($primary_links) { ?><div id="primary"><?php print theme('links', $primary_links) ?></div><?php } ?>
-      <?php if ($search_box) { ?><form action="<?php print $search_url ?>" method="post">
-        <div id="search">
-          <input class="form-text" type="text" size="15" value="" name="edit[keys]" alt="<?php print $search_description ?>" />
-          <input class="form-submit" type="submit" value="<?php print $search_button_text ?>" />
-        </div>
-      </form><?php } ?>
+      <?php print $search_box ?> 
     </td>
   </tr>
   <tr>
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index a793509d7..455186080 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -199,10 +199,7 @@ function phptemplate_page($content) {
     'primary_links'       => theme_get_setting('primary_links'),
     'site_name'           => (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''),
     'site_slogan'         => (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''),
-    'search_box'          => theme_get_setting('toggle_search'),
-    'search_button_text'  => t('search'),
-    'search_description'  => t('Enter the terms you wish to search for.'),
-    'search_url'          => url('search'),
+    'search_box'          => (theme_get_setting('toggle_search') ? search_box() : ''),
     'secondary_links'     => theme_get_setting('secondary_links'),
     'sidebar_left'        => $sidebar_left,
     'sidebar_right'       => $sidebar_right,
diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php
index 88a3d2783..bc46c38dd 100644
--- a/themes/pushbutton/page.tpl.php
+++ b/themes/pushbutton/page.tpl.php
@@ -45,14 +45,7 @@
       <?php print theme('links', $secondary_links) ?>
     </td>
     <td  width="25%"  align="center" valign="middle">
-      <?php if ($search_box): ?>
-      <form action="<?php print $search_url ?>" method="post">
-        <div id="search">
-          <input class="form-text" type="text" size="15" value="" name="edit[keys]" alt="<?php print $search_description ?>" />
-          <input class="form-submit" type="submit" value="<?php print $search_button_text ?>" alt="submit" />
-        </div>
-      </form>
-      <?php endif; ?>
+      <?php print $search_box ?>
     </td>
   </tr>
   <tr>
-- 
cgit v1.2.3