diff --git a/CHANGELOG.txt b/CHANGELOG.txt index be83a06348717b7b5ed8859bb437deaec98ad1f5..fe1de74063327903464e158057b067871ee014ba 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,8 @@ // $Id$ +Drupal 6.15-dev, xxxx-xx-xx (development release) +---------------------- + Drupal 6.14, 2009-09-16 ---------------------- - Fixed security issues (OpenID association cross site request forgeries, diff --git a/includes/common.inc b/includes/common.inc index ff814c8a85ce9fbcbafc1c094c40706d5361c296..fa3878e347c125c0486a5c1217d46acc9288c31d 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_NOTICE ^ E_DEPRECATED)) { + 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 75d94ca67690fb387604b58fa9c9fae2becab64f..8666019e9f638191de229bcc2f7003c2eea18887 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -9,7 +9,7 @@ /** * The current system version. */ -define('VERSION', '6.14'); +define('VERSION', '6.15-dev'); /** * Core API compatibility.