diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 63da6645c6860cfb7be2673b8e648a3ea2f490fa..a7eb7a89edb8d2f41acacecdb5ef16e28ea43afd 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,7 +1,8 @@ // $Id$ -Drupal 6.20-dev, xxxx-xx-xx (development release) +Drupal 6.20, 2010-12-15 ---------------------- +- Fixed a variety of small bugs, improved code documentation. Drupal 6.19, 2010-08-11 ---------------------- diff --git a/includes/common.inc b/includes/common.inc index 73d97f1549d48cd2235150fc13c2cdb76912285e..cf70d22d83dafdfad319561b88360d691b919f2d 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -631,7 +631,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) { return; } - if ($errno & (E_ALL ^ E_DEPRECATED)) { + if ($errno & (E_ALL ^ E_DEPRECATED ^ E_NOTICE)) { $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 932ab2a6f57ee2ddcacdd33846f57cb9258446dd..e55666c7fc37d2f1668a131fbf7597885db200a9 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -9,7 +9,7 @@ /** * The current system version. */ -define('VERSION', '6.20-dev'); +define('VERSION', '6.20'); /** * Core API compatibility.