diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ca3abe126e25cb1909ffe13768c05545e034c721..d3430723e540885476f642e3286ae97865c5575a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,8 @@ // $Id$ +Drupal 6.16-dev, xxxx-xx-xx (development release) +---------------------- + Drupal 6.15, 2009-12-16 ---------------------- - Fixed security issues (Cross site scripting), see SA-CORE-2009-009. diff --git a/includes/common.inc b/includes/common.inc index 52672796d21a5de5d03225083c76da7065628b38..f72a826ebe61a54e39e4bec39293efbe56e7b7a8 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -617,7 +617,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 f886d4c8e04d24b039effc55100b2066918fbc10..f232a9998c7eeb73bd26698aa55a0d49702fcf32 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -9,7 +9,7 @@ /** * The current system version. */ -define('VERSION', '6.15'); +define('VERSION', '6.16-dev'); /** * Core API compatibility.