diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d0e6d64141b2e10c412f98aa98eb35c461bb6068..8a450ce934c658a834c526d73cc2e5146614fc5f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,7 @@ +Drupal 6.27-dev, xxxx-xx-xx (development release) +---------------------- + Drupal 6.26, 2012-05-02 ---------------------- - Fixed a small number of bugs. diff --git a/includes/common.inc b/includes/common.inc index b86f2d2edc0c693d720a951d85f954f3a5b53a61..7d0bf853939ba4013eb2560ef2a55bd8c635b335 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -663,7 +663,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 31e6302dddf5cf75a40880ae9304eba89bebd17a..8e9d237519f8d29d449501e5f8de65df810758f5 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -8,7 +8,7 @@ /** * The current system version. */ -define('VERSION', '6.26'); +define('VERSION', '6.27-dev'); /** * Core API compatibility.