mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

moved custom errorHandler to avoid XML Feed declaring and callback errors

Browse Source
This commit is contained in:
Ian
2011-12-06 12:36:03 +01:00
parent 637af26463
commit c2afd4efc0
2 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/compat.inc.php
View File

@ -67,6 +67,37 @@ function memSnap($tshow = '') {
$memUsage = $current;
}
/**
* Set our own exeption handler to convert all errors into exeptions automatically
* function_exists() avoids 'cannot redeclare previously declared' fatal errors in XML feed context
*
* @access public
* @param standard
* @return null
*/
if(!function_exists('errorToExceptionHandler')) {
function errorToExceptionHandler($errNo, $errStr, $errFile, $errLine, $errContext) {
// ToDo: enhance for special serendipity error needs,
// like $errContext or specify tracing off in user context
// @disabled errors will not appear
$rep = ini_get('error_reporting');
// function error handler must return false to support $php_errormsg messages
if(!($rep & $errStr)) { return false; }
// respect user has set php to not display errors at all
// may be overridden by if(ini_get('display_errors') == 0) print error in further context
elseif (error_reporting() == 0) { return; }
// throw errors as exception
else {
if($serendipity['production'] !== true) echo ' == DEBUG MODE == ';
echo '<pre>';
throw new ErrorException($errStr, 0, $errNo, $errFile, $errLine);
echo '</pre>';
}
return true;
}
}
if (!function_exists('file_get_contents')) {
function file_get_contents($filename, $use_include_path = 0) {
$file = fopen($filename, 'rb', $use_include_path);

32
serendipity_config.inc.php
View File

@ -6,8 +6,6 @@ if (defined('S9Y_FRAMEWORK')) {
return;
}
set_error_handler('errorToExceptionHandler', E_ALL & ~E_NOTICE);
@define('S9Y_FRAMEWORK', true);
if (!headers_sent()) {
@ -62,31 +60,13 @@ if ($serendipity['production'] !== true) {
@ini_set('display_errors', 'on');
}
/**
* Set our own exeption handler to convert all errors into exeptions automatically
*
* @access public
* @param standard
* @return null
*/
function errorToExceptionHandler($errNo, $errStr, $errFile, $errLine, $errContext) {
// ToDo: enhance for special serendipity error needs,
// like $errContext or specify tracing off in user context
// @disabled errors will not appear
// The serendipity errorhandler string
$serendipity['errorhandler'] = 'errorToExceptionHandler';
$rep = ini_get('error_reporting');
// function error handler must return false to support $php_errormsg
if(!($rep & $errStr)) { return false; }
// respect user has set php to not display errors at all
// may be overridden by if(ini_get('display_errors') == 0) print error in further context
elseif (error_reporting() == 0) { return; }
else {
if($serendipity['production'] !== true) echo ' == DEBUG MODE == ';
echo '<pre>';
throw new ErrorException($errStr, 0, $errNo, $errFile, $errLine);
echo '</pre>';
}
return true;
//[internal callback function]: errorToExceptionHandler()
if(is_callable($serendipity['errorhandler'], false, $callable_name)) {
// set serendipity global error to exeption handler
set_error_handler($serendipity['errorhandler'], E_ALL & ~E_NOTICE);
}
// Default rewrite method