diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 428daf8afb4179e7e0b57762a7cce6397e13c766..a2f05dd5d322056d68e839410171c8d9321e6909 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,7 @@ +Drupal 6.28-dev, xxxx-xx-xx (development release) +---------------------- + Drupal 6.27, 2012-12-19 ---------------------- - Fixed security issues (multiple vulnerabilities), see SA-CORE-2012-004. diff --git a/includes/common.inc b/includes/common.inc index 2abf1988d1047dfa54d4eaf051151ad7a0031e24..ea353d192550d602f1e9bf4e40ed79fa557ba28f 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 1581cd8c23da178c373fca754cedd3a3aff3084f..57cc91a1c576b70367c2c1d265c18b6092de803d 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '6.27'); +define('VERSION', '6.28-dev'); /** * Core API compatibility.