diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-12-20 23:14:11 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-12-20 23:14:11 +0000 |
| commit | d5974b78629c3ee01592eab2f2576d57893cd688 (patch) | |
| tree | bac1bbdb492a6126c199f04bbd5ed9ef6d41d041 | |
| parent | efd544136b51936e3eaada121c602e35f5d9faae (diff) | |
| download | brdo-d5974b78629c3ee01592eab2f2576d57893cd688.tar.gz brdo-d5974b78629c3ee01592eab2f2576d57893cd688.tar.bz2 | |
back to 6.x-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 e5a5ef735..560dde4a0 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,6 @@ // $Id$ -Drupal 6.0-rc1, 2007-12-20 +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 6a7fcc6b8..ecbc3dfff 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -578,7 +578,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 e6f328de6..573562c11 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -9,7 +9,7 @@ /** * The current system version. */ -define('VERSION', '6.0-rc1'); +define('VERSION', '6.0-dev'); /** * Core API compatibility. |