diff --git a/CHANGELOG.txt b/CHANGELOG.txt index fa1fd027d2bb40ad497639f5a051cf15a1dd7b07..5c7df4b3d50e89ae08be717e03ca95bcb9d0c053 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,7 @@ +Drupal 6.29-dev, xxxx-xx-xx (development release) +---------------------- + Drupal 6.28, 2013-01-16 ---------------------- - Fixed security issues (multiple vulnerabilities), see SA-CORE-2013-001. diff --git a/includes/common.inc b/includes/common.inc index 5daec4737464a9d322c97167a16bbc83e50f7291..b7d671ca969cad918014b09610984f1d8bd581ca 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -665,7 +665,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) { return; } - if ($errno & (E_ALL ^ E_DEPRECATED ^ E_NOTICE)) { + if ($errno & (E_ALL ^ E_DEPRECATED)) { $types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice', 2048 => 'strict warning', 4096 => 'recoverable fatal error'); // For database errors, we want the line number/file name of the place that diff --git a/modules/system/system.module b/modules/system/system.module index 320f51fa1570deece1feb518c8855192ed5b1daf..45a829f213135976389e5cfb6c960f464e6828b5 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '6.28'); +define('VERSION', '6.29-dev'); /** * Core API compatibility.