aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/elgglib.php
diff options
context:
space:
mode:
authorPaweł Sroka <srokap@gmail.com>2013-03-06 19:04:35 +0100
committerPaweł Sroka <srokap@gmail.com>2013-03-11 03:42:26 +0100
commit2c7fe16e6d8d135109c6da60739e4ffad99876d5 (patch)
tree8ff2bda0b5ab7d2f333666abe3c7bdb719213cd0 /engine/lib/elgglib.php
parente9f710c18089489c402cae23fbac71c0b7283824 (diff)
downloadelgg-2c7fe16e6d8d135109c6da60739e4ffad99876d5.tar.gz
elgg-2c7fe16e6d8d135109c6da60739e4ffad99876d5.tar.bz2
Refs #5199 - Adds additional info to locate output start in case of headers already sent exception
Diffstat (limited to 'engine/lib/elgglib.php')
-rw-r--r--engine/lib/elgglib.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 74b70f9fb..2ae307392 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -128,7 +128,7 @@ function elgg_load_library($name) {
* @throws SecurityException
*/
function forward($location = "", $reason = 'system') {
- if (!headers_sent()) {
+ if (!headers_sent($file, $line)) {
if ($location === REFERER) {
$location = $_SERVER['HTTP_REFERER'];
}
@@ -147,7 +147,7 @@ function forward($location = "", $reason = 'system') {
exit;
}
} else {
- throw new SecurityException(elgg_echo('SecurityException:ForwardFailedToRedirect'));
+ throw new SecurityException(elgg_echo('SecurityException:ForwardFailedToRedirect', array($file, $line)));
}
}