summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2008-02-08 23:00:50 +0000
committerGábor Hojtsy2008-02-08 23:00:50 +0000
commit92c6453bc2c0b4c99e43d9d38dc7d7e24254e0ad (patch)
tree0e45ff843957758929fa09e4e1ed173d4f425eff
parentba74c7ce25f40d95e028aa9dc0e66c5c64a9788b (diff)
Start rolling with Drupal 6 RC4:6.0-rc-4
- include Drupal 5.7 changelog - correct jQuery version number - error level fix for RC - version numbers aligned
-rw-r--r--CHANGELOG.txt9
-rw-r--r--includes/common.inc2
-rw-r--r--modules/system/system.module2
3 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 61ca417..f886005 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
// $Id$
-Drupal 6.0, xxxx-xx-xx (development version)
+Drupal 6.0-rc4, 2008-02-08
----------------------
- New, faster and better menu system.
- New watchdog as a hook functionality.
@@ -92,7 +92,7 @@ Drupal 6.0, xxxx-xx-xx (development version)
and warn sites if they are missing security updates or newer versions.
Sites deploying from CVS should use http://drupal.org/project/cvs_deploy.
Advanced settings provided by http://drupal.org/project/update_advanced.
-- Upgraded the core JavaScript library to jQuery version 1.2.
+- Upgraded the core JavaScript library to jQuery version 1.2.3.
- Added a new Schema API, which provides built-in support for core and
contributed modules to work with databases other than MySQL.
- Removed drupal.module. The functionality lives on as the Site network
@@ -100,6 +100,11 @@ Drupal 6.0, xxxx-xx-xx (development version)
- Removed old system updates. Updates from Drupal versions prior to 5.x will
require upgrading to 5.x before upgrading to 6.x.
+Drupal 5.7, 2008-01-28
+----------------------
+- fixed the input format configuration page.
+- fixed a variety of small bugs.
+
Drupal 5.6, 2008-01-10
----------------------
- fixed a variety of small bugs.
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 e954c92..ba044cc 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-rc4');
/**
* Core API compatibility.