diff options
author | rvelices <rv-github@modusoptimus.com> | 2006-04-28 05:12:25 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2006-04-28 05:12:25 +0000 |
commit | aaea0a1653e42bfa2db8e5be2e36f5e22be16631 (patch) | |
tree | c813db5f5550be832cc71d2f334f94a86de28839 /include/section_init.inc.php | |
parent | 0510cfdc5ad38487600f8f1bf8e4d4f9747781df (diff) |
merge -r1287 from branch-1_6 to trunk
bug 349: Nicer display messages instead of "die" when urls cannot be
solved (also set 404 status code for bots)
git-svn-id: http://piwigo.org/svn/trunk@1288 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/section_init.inc.php')
-rw-r--r-- | include/section_init.inc.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/section_init.inc.php b/include/section_init.inc.php index 3a27882ba..1d5949e63 100644 --- a/include/section_init.inc.php +++ b/include/section_init.inc.php @@ -197,7 +197,7 @@ SELECT name, url_name, id } if ( empty($page['tags']) ) { - die('Fatal: no existing tag'); + page_not_found('Requested tag does not exist', get_root_url().'tags.php' ); } } else if (0 === strpos($tokens[$next_token], 'fav')) @@ -316,6 +316,10 @@ if ('categories' == $page['section']) if (isset($page['category'])) { $result = get_cat_info($page['category']); + if (empty($result)) + { + page_not_found('Requested category does not exist' ); + } $page = array_merge( $page, |