From 60cb54b9382b642111cacff358c9641aa9de9da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Wed, 30 Jan 2008 23:07:41 +0000
Subject: [PATCH] Back to 6.0-dev
---
CHANGELOG.txt | 2 +-
includes/common.inc | 2 +-
modules/system/system.module | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8513316e0598..74723113c118 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
// $Id$
-Drupal 6.0-rc3, 2008-01-30
+Drupal 6.0, xxxx-xx-xx (development version)
----------------------
- New, faster and better menu system.
- New watchdog as a hook functionality.
diff --git a/includes/common.inc b/includes/common.inc
index d585f324ab9e..789a016737ae 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 ^ 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 7979341c7f47..a7619c207ca2 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.0-rc3');
+define('VERSION', '6.0-dev');
/**
* Core API compatibility.
--
GitLab