aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-05-16 19:25:41 +0200
committerNils Adermann <naderman@naderman.de>2010-05-16 19:25:41 +0200
commite36da18b1c3a492df5789252600b1fc80805472a (patch)
tree51034145f39aa75867bde558873ccd4e658d6375
parent321f7a9946d68d589749d550fceb50970d1e2d47 (diff)
parent82ce29ac5855f13e803556b14960af3b759dc14b (diff)
downloadforums-e36da18b1c3a492df5789252600b1fc80805472a.tar
forums-e36da18b1c3a492df5789252600b1fc80805472a.tar.gz
forums-e36da18b1c3a492df5789252600b1fc80805472a.tar.bz2
forums-e36da18b1c3a492df5789252600b1fc80805472a.tar.xz
forums-e36da18b1c3a492df5789252600b1fc80805472a.zip
Merge branch 'ticket/p/7782' into develop-olympus
* ticket/p/7782: [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
-rw-r--r--phpBB/includes/functions.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 01f17fa521..cd8447a2a3 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3621,6 +3621,11 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
$user->setup();
}
+ if ($msg_text == 'NO_FORUM' || $msg_text == 'NO_TOPIC' || $msg_text == 'NO_USER')
+ {
+ header("HTTP/1.x 404 Not Found");
+ }
+
$msg_text = (!empty($user->lang[$msg_text])) ? $user->lang[$msg_text] : $msg_text;
$msg_title = (!isset($msg_title)) ? $user->lang['INFORMATION'] : ((!empty($user->lang[$msg_title])) ? $user->lang[$msg_title] : $msg_title);