aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/elgglib.php
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2013-03-19 21:13:07 -0700
committerSteve Clay <steve@mrclay.org>2013-03-19 21:13:07 -0700
commit45cf92ffe7ae503c5fea447dba1f1ab9815f4f7f (patch)
treefb546cc1594ea61b35e9767e674ebe1863ad21b4 /engine/lib/elgglib.php
parent36755bea9aefd7e8bf54deab7b29902f8733f9aa (diff)
parent2c7fe16e6d8d135109c6da60739e4ffad99876d5 (diff)
downloadelgg-45cf92ffe7ae503c5fea447dba1f1ab9815f4f7f.tar.gz
elgg-45cf92ffe7ae503c5fea447dba1f1ab9815f4f7f.tar.bz2
Merge pull request #5222 from Srokap/ticket_5200
Refs #5199 - Adds additional info to locate output start in case of head...
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 281b23535..f4b1a0a3e 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)));
}
}