summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2008-01-30 22:43:55 +0000
committerGábor Hojtsy2008-01-30 22:43:55 +0000
commitc2665870c47b30bf35b91dd471d961c170f5a131 (patch)
tree0c24f90388fcbf0b3b7244fa31ba517e4e775ccd
parent46c1d9239f4996bf0320c17fcac7443be6c475e5 (diff)
Preparing for RC36.0-rc-3
-rw-r--r--CHANGELOG.txt2
-rw-r--r--includes/common.inc2
-rw-r--r--modules/system/system.module2
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7472311..8513316 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
// $Id$
-Drupal 6.0, xxxx-xx-xx (development version)
+Drupal 6.0-rc3, 2008-01-30
----------------------
- New, faster and better menu system.
- New watchdog as a hook functionality.
diff --git a/includes/common.inc b/includes/common.inc
index 789a016..d585f32 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -577,7 +577,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) {
return;
}
- if ($errno & (E_ALL)) {
+ if ($errno & (E_ALL ^ 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 a7619c2..7979341 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.0-dev');
+define('VERSION', '6.0-rc3');
/**
* Core API compatibility.