diff options
Diffstat (limited to 'modules/search.module')
| -rw-r--r-- | modules/search.module | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/modules/search.module b/modules/search.module index 78bca2a88..9dedb035a 100644 --- a/modules/search.module +++ b/modules/search.module @@ -46,6 +46,10 @@ function search_link($type) { menu("search", t("search"), "search_page", 0, 1); } + if ($type == "system" && user_access("search content")) { + menu("search", t("search"), "search_page", 0, 1); + } + return $links; } @@ -361,23 +365,22 @@ function search_view($keys) { $help_link = l(t("search help"), "search/help"); switch (variable_get("help_pos", 1)) { case "1": - $form = search_help(). $form; + $form = search_help(). $form ."<br />"; break; case "2": - $form .= search_help(); + $form .= search_help() ."<br />"; break; case "3": - $form = $help_link. "<br />". $form; + $form = $help_link. "<br />". $form ."<br />"; break; case "4": - $form .= "<br />". $help_link; + $form .= "<br />". $help_link ."<br />"; } - print theme("header", t("Search")); + drupal_set_title(t("Search")); + print theme("header"); - if ($form) { - print theme("box", t("Search"), $form); - } + print $form; if ($keys) { if ($output) { @@ -391,8 +394,9 @@ function search_view($keys) { print theme("footer"); } else { - print theme("header", t("Access denied")); - print theme("box", t("Access denied"), message_access()); + drupal_set_title(t("Access denied")); + print theme("header"); + print message_access(); print theme("footer"); } @@ -403,8 +407,9 @@ function search_page() { switch (arg(1)) { case "help": + drupal_set_title(t("Search Help")); print theme("header"); - print theme("box", t("Search Help"), search_help()); + print search_help(); print theme("footer"); break; default: |