summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2008-04-14 15:54:22 (GMT)
committer JohnAlbin2008-04-14 15:54:22 (GMT)
commitef4e56fbe4395b572782dc9100dd0ff7d94c77d3 (patch)
tree73d4d7722d54b7501bc476793bb3cf188deef131
parentc6f63d0f88ecd3a388738117015e1e7078087b9e (diff)
#229661: earch Box doesn't return any results or warnings
-rw-r--r--CHANGELOG.txt1
-rw-r--r--STARTERKIT/template.php13
-rw-r--r--zen/search-theme-form.tpl.php8
-rw-r--r--zen_classic/template.php11
4 files changed, 2 insertions, 31 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4fd6d68..501552c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
Zen 6.x-1.x-dev
* Upgrading to Drupal 6. Not yet complete.
+ #229661: earch Box doesn't return any results or warnings
#244023 by jjeff: Make block editing links go to actual menu edit pages
#245968 by jjeff: Put the word "Comments" above comments
#238387: Update README on how to edit the .info file
diff --git a/STARTERKIT/template.php b/STARTERKIT/template.php
index 727f1e1..b7bc2a1 100644
--- a/STARTERKIT/template.php
+++ b/STARTERKIT/template.php
@@ -41,7 +41,7 @@ include_once 'theme-settings-init.php';
*/
// Optionally add a fixed width CSS file.
-/* -- Delete this line if you want to use this code
+/* -- Delete this line if you want to use and modify this code
if (theme_get_setting('STARTERKIT_fixed')) {
drupal_add_css(path_to_theme() .'/layout-fixed.css', 'theme', 'all');
}
@@ -128,17 +128,6 @@ function STARTERKIT_preprocess_block(&$vars) {
/**
- * Override the Drupal search form using the search-theme-form.tpl.php file.
- *
- * @TODO Fix this functionality; this function is totally broken in D6.
- */
-/* -- Delete this line if you want to use this function
-function STARTERKIT_search_theme_form($form) {
- return _phptemplate_callback('search_theme_form', array('form' => $form), array('search-theme-form'));
-}
-// */
-
-/**
* Fixes broken calls to l() in Drupal's (6.0-6.2) theme_username().
*/
/* -- Delete this line if you want to use this function
diff --git a/zen/search-theme-form.tpl.php b/zen/search-theme-form.tpl.php
deleted file mode 100644
index 879b450..0000000
--- a/zen/search-theme-form.tpl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="search" class="container-inline">
- <div class="form-item">
- <input type="text" maxlength="128" name="search_theme_form_keys" id="edit-search-theme-form-keys" size="15" value="" title="<?php print t('Enter the terms you wish to search for.'); ?>" class="form-text" />
- </div>
- <input type="submit" name="op" id="edit-submit" value="<?php print t('Search'); ?>" class="form-submit" />
- <input type="hidden" name="form_token" id="edit-search-theme-form-form-token" value="<?php print drupal_get_token('search_theme_form'); ?>" />
- <input type="hidden" name="form_id" id="edit-search-theme-form" value="search_theme_form" />
-</div>
diff --git a/zen_classic/template.php b/zen_classic/template.php
index 84fa06c..9aab333 100644
--- a/zen_classic/template.php
+++ b/zen_classic/template.php
@@ -126,17 +126,6 @@ function zen_classic_preprocess_block(&$vars) {
/**
- * Override the Drupal search form using the search-theme-form.tpl.php file.
- *
- * @TODO Fix this functionality; this function is totally broken in D6.
- */
-/* -- Delete this line if you want to use this function
-function zen_classic_search_theme_form($form) {
- return _phptemplate_callback('search_theme_form', array('form' => $form), array('search-theme-form'));
-}
-// */
-
-/**
* Fixes broken calls to l() in Drupal's (6.0-6.2) theme_username().
*/
function zen_classic_username($object) {