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

Damn, why does cherry picking not work?

Browse Source
This commit is contained in:
Garvin Hicking
2012-06-12 20:51:57 +02:00
parent 286a24b8cc
commit f12f53aaab
4 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
serendipity_config.inc.php
View File

@ -51,7 +51,8 @@ $serendipity['version'] = '2.0-alpha1';
$serendipity['production'] = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
// Set error reporting
error_reporting(E_ALL & ~E_NOTICE);
// TODO: E_STRICT throws problematic errors due to "hook_event" being a static function, but all of our plugins don't really define that...
error_reporting(E_ALL & ~E_NOTICE ^ E_STRICT);
if ($serendipity['production'] !== true) {
if ($serendipity['production'] === 'debug') {
@ -71,7 +72,7 @@ if(is_callable($serendipity['errorhandler'], false, $callable_name)) {
#} else {
// Caution! If we want to have the same noshow effect as upper set error_reporting(E_ALL) in 'debug' mode,
// do not clone it to set_error_handler(E_ALL), else everythimg is haltet to debug, which makes using debug obsolet.
set_error_handler($serendipity['errorhandler'], E_ALL & ~E_NOTICE);
set_error_handler($serendipity['errorhandler'], E_ALL & ~E_NOTICE ^ E_STRICT);
#}
}
@ -143,7 +144,7 @@ if (!isset($serendipity['languages'])) {
'fi' => 'Finnish',
'cs' => 'Czech (Win-1250)',
'cz' => 'Czech (ISO-8859-2)',
'sk' => 'Slovak',
'sk' => 'Slovak',
'nl' => 'Dutch',
'is' => 'Icelandic',
'tr' => 'Turkish',