diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 18ee76d67a2ad4f83753712c97f8950ff12c5d08..71c76412d47371bfd94a7be506805f113ae6eaf2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,8 @@ // $Id$ +Drupal 6.7-dev, xxxx-xx-xx (development release) +---------------------- + Drupal 6.6, 2008-10-22 ---------------------- - Fixed security issues, (File inclusion, Cross site scripting), see SA-2008-067 diff --git a/includes/common.inc b/includes/common.inc index 9488bb92531965836ad6eef35abf497ef1d64d4e..445261fdc1724d98480d02b55f356f8726326648 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -587,7 +587,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) { return; } - if ($errno & (E_ALL ^ E_NOTICE)) { + if ($errno & (E_ALL)) { $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 934a5654519007078489851e6213838a466d53bf..479c288b2aa0b8ebf9085b4ae0b05be6e63691c0 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -9,7 +9,7 @@ /** * The current system version. */ -define('VERSION', '6.6'); +define('VERSION', '6.7-dev'); /** * Core API compatibility.