diff options
| author | Steve Clay <steve@mrclay.org> | 2013-03-19 21:13:07 -0700 |
|---|---|---|
| committer | Steve Clay <steve@mrclay.org> | 2013-03-19 21:13:07 -0700 |
| commit | 45cf92ffe7ae503c5fea447dba1f1ab9815f4f7f (patch) | |
| tree | fb546cc1594ea61b35e9767e674ebe1863ad21b4 | |
| parent | 36755bea9aefd7e8bf54deab7b29902f8733f9aa (diff) | |
| parent | 2c7fe16e6d8d135109c6da60739e4ffad99876d5 (diff) | |
| download | elgg-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...
| -rw-r--r-- | engine/lib/elgglib.php | 4 | ||||
| -rw-r--r-- | languages/en.php | 2 |
2 files changed, 3 insertions, 3 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))); } } diff --git a/languages/en.php b/languages/en.php index fe450b8a2..501855f02 100644 --- a/languages/en.php +++ b/languages/en.php @@ -175,7 +175,7 @@ $english = array( 'ConfigurationException:NoSiteID' => "No site ID has been specified.", 'SecurityException:APIAccessDenied' => "Sorry, API access has been disabled by the administrator.", 'SecurityException:NoAuthMethods' => "No authentication methods were found that could authenticate this API request.", - 'SecurityException:ForwardFailedToRedirect' => 'Redirect could not be issued due to headers already being sent. Halting execution for security. Search http://docs.elgg.org/ for more information.', + 'SecurityException:ForwardFailedToRedirect' => 'Redirect could not be issued due to headers already being sent. Halting execution for security. Output started in file %s at line %d. Search http://docs.elgg.org/ for more information.', 'InvalidParameterException:APIMethodOrFunctionNotSet' => "Method or function not set in call in expose_method()", 'InvalidParameterException:APIParametersArrayStructure' => "Parameters array structure is incorrect for call to expose method '%s'", 'InvalidParameterException:UnrecognisedHttpMethod' => "Unrecognised http method %s for api method '%s'", |