diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-12-16 21:06:34 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-12-16 21:06:34 +0000 |
| commit | 670a292277682351c373780746aedd5c110b3b08 (patch) | |
| tree | f6122c8d99f90f001e0d5e0d84f2dde8f99e0214 /modules | |
| parent | 595c790a9c488b16875e4a0f8eb5a35e0df2845c (diff) | |
| download | brdo-670a292277682351c373780746aedd5c110b3b08.tar.gz brdo-670a292277682351c373780746aedd5c110b3b08.tar.bz2 | |
- Reworked 404 (page not found) handling. Patch by walkah. You can specify a
custom 404 page in the administration page. As a result, error.php could be
removed.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/forum.module | 2 | ||||
| -rw-r--r-- | modules/forum/forum.module | 2 | ||||
| -rw-r--r-- | modules/system.module | 1 | ||||
| -rw-r--r-- | modules/system/system.module | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/modules/forum.module b/modules/forum.module index b227d3a5a..a41ab0479 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -162,8 +162,10 @@ function forum_view($node, $main = 0, $page = 0) { // print the breadcrumb drupal_set_breadcrumb($breadcrumb); } + // prepare the node content $node = forum_content($node); + // print the node $output .= theme("node", $node, $main, $page); diff --git a/modules/forum/forum.module b/modules/forum/forum.module index b227d3a5a..a41ab0479 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -162,8 +162,10 @@ function forum_view($node, $main = 0, $page = 0) { // print the breadcrumb drupal_set_breadcrumb($breadcrumb); } + // prepare the node content $node = forum_content($node); + // print the node $output .= theme("node", $node, $main, $page); diff --git a/modules/system.module b/modules/system.module index d821ec530..5ac19cc54 100644 --- a/modules/system.module +++ b/modules/system.module @@ -116,6 +116,7 @@ function system_view_general() { $group .= form_textarea(t("Footer message"), "site_footer", variable_get("site_footer", ""), 70, 5, t("This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.")); $group .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 70, 70, t("The name used to indicate anonymous users.")); $group .= form_textfield(t("Default front page"), "site_frontpage", variable_get("site_frontpage", "node"), 70, 70, t("The home page displays content from this relative URL. If you are not using clean URLs, specify the part after '?q='. If unsure, specify 'node'.")); + $group .= form_textfield(t("Default 404 (not found) page"), "site_404", variable_get("site_404", ""), 70, 70, t("This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after '?q='. If unsure, specify 'node'.")); $group .= form_radios(t("Clean URLs"), "clean_url", variable_get("clean_url", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable clean URLs. If enabled, you'll need <code>ModRewrite</code> support. See also the <code>.htaccess</code> file in Drupal's top-level directory.")); $output = form_group(t("General settings"), $group); diff --git a/modules/system/system.module b/modules/system/system.module index d821ec530..5ac19cc54 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -116,6 +116,7 @@ function system_view_general() { $group .= form_textarea(t("Footer message"), "site_footer", variable_get("site_footer", ""), 70, 5, t("This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages.")); $group .= form_textfield(t("Anonymous user"), "anonymous", variable_get("anonymous", "Anonymous"), 70, 70, t("The name used to indicate anonymous users.")); $group .= form_textfield(t("Default front page"), "site_frontpage", variable_get("site_frontpage", "node"), 70, 70, t("The home page displays content from this relative URL. If you are not using clean URLs, specify the part after '?q='. If unsure, specify 'node'.")); + $group .= form_textfield(t("Default 404 (not found) page"), "site_404", variable_get("site_404", ""), 70, 70, t("This page is displayed when no other content matches the requested document. If you are not using clean URLs, specify the part after '?q='. If unsure, specify 'node'.")); $group .= form_radios(t("Clean URLs"), "clean_url", variable_get("clean_url", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable clean URLs. If enabled, you'll need <code>ModRewrite</code> support. See also the <code>.htaccess</code> file in Drupal's top-level directory.")); $output = form_group(t("General settings"), $group); |