diff options
author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-11-21 22:53:40 +0000 |
---|---|---|
committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-11-21 22:53:40 +0000 |
commit | 98eefd9f0c42a33718a60ee43f55159a7edd0b0d (patch) | |
tree | 455be4ebd2a0822e476484ae467a8bb30edf46b1 | |
parent | b3bda1c1e9d6cd72f26448f49c16e166bc24f53a (diff) | |
download | brdo-98eefd9f0c42a33718a60ee43f55159a7edd0b0d.tar.gz brdo-98eefd9f0c42a33718a60ee43f55159a7edd0b0d.tar.bz2 |
back to Drupal 6.0-dev
-rw-r--r-- | CHANGELOG.txt | 2 | ||||
-rw-r--r-- | includes/common.inc | 2 | ||||
-rw-r--r-- | modules/system/system.module | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 33d701f74..bd9b591a5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,6 @@ // $Id$ -Drupal 6.0-beta3, 2007-11-21 +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 8952f7a5c..b6963c677 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -562,7 +562,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'); // 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 ac0e9e0f7..97463f137 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -6,7 +6,7 @@ * Configuration system that lets administrators modify the workings of the site. */ -define('VERSION', '6.0-beta3'); +define('VERSION', '6.0-dev'); define('DRUPAL_CORE_COMPATIBILITY', '6.x'); define('DRUPAL_MINIMUM_PHP', '4.3.3'); |