diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-19 11:52:32 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-19 11:52:32 +0200 |
| commit | 991656a3ef396d9a6bd43ddb752627c2880b17ba (patch) | |
| tree | 9bd21eacb8f29bcd20917b4a21ff1c00ba6d8e2f | |
| parent | 6b6f45f9f1c0fa5c0142c0bf1d9a93b77694ea4b (diff) | |
| download | volse-hubzilla-991656a3ef396d9a6bd43ddb752627c2880b17ba.tar.gz volse-hubzilla-991656a3ef396d9a6bd43ddb752627c2880b17ba.tar.bz2 volse-hubzilla-991656a3ef396d9a6bd43ddb752627c2880b17ba.zip | |
Show "404.tpl" instead of using 'notice()' in case of 404
| -rw-r--r-- | index.php | 5 | ||||
| -rw-r--r-- | mod/help.php | 6 | ||||
| -rw-r--r-- | view/404.tpl | 1 |
3 files changed, 9 insertions, 3 deletions
@@ -207,7 +207,10 @@ if(strlen($a->module)) { logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG); header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found')); - notice( t('Page not found.' ) . EOL); + $tpl = get_markup_template("404.tpl"); + $a->page['content'] = replace_macros($tpl, array( + '$message' => t('Page not found.' ) + )); } } diff --git a/mod/help.php b/mod/help.php index 59e062f6d..af05bd47c 100644 --- a/mod/help.php +++ b/mod/help.php @@ -36,8 +36,10 @@ function help_content(&$a) { if(! strlen($text)) { header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found')); - notice( t('Page not found.' ) . EOL); - return; + $tpl = get_markup_template("404.tpl"); + return replace_macros($tpl, array( + '$message' => t('Page not found.' ) + )); } return Markdown($text); diff --git a/view/404.tpl b/view/404.tpl new file mode 100644 index 000000000..bf4d4e949 --- /dev/null +++ b/view/404.tpl @@ -0,0 +1 @@ +<h1>$message</h1> |