diff options
| author |  Mark Pemberton | 2011-06-04 00:38:07 -0400 |
|---|---|---|
| committer | Mark Pemberton | 2011-06-04 00:38:07 -0400 |
| commit | b628e63e015bc3b2eadc712feaa6c4d05cf75bbd (patch) | |
| tree | ebdcec5c8133a3b6f86d06dc3f6fb3de46609f04 /data/templates/error.404.tpl.php | |
| parent | 84e603aa91a303a1419962ff3ff6086710a7b1a9 (diff) | |
| parent | 4c8a53c5bc632302aaf8978e711eb53a03166db5 (diff) | |
| download | scuttle-b628e63e015bc3b2eadc712feaa6c4d05cf75bbd.tar.gz scuttle-b628e63e015bc3b2eadc712feaa6c4d05cf75bbd.zip | |
Merge branch 'master' into privatekey2
Conflicts:
data/templates/default/bookmarks.tpl.php
Diffstat (limited to 'data/templates/error.404.tpl.php')
| -rw-r--r-- | data/templates/error.404.tpl.php | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/data/templates/error.404.tpl.php b/data/templates/error.404.tpl.php deleted file mode 100644 index fe9401d..0000000 --- a/data/templates/error.404.tpl.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php -header('HTTP/1.x 404 Not Found'); -$this->includeTemplate($GLOBALS['top_include']); -if (!$error) { - echo '<h1>'. T_('Not Found') .'</h1>'; - echo '<p>'. T_('The requested URL was not found on this server') .'</p>'; -} -$this->includeTemplate($GLOBALS['bottom_include']); -?>
\ No newline at end of file |