summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2009-02-25 21:02:37 +0000
committerGábor Hojtsy2009-02-25 21:02:37 +0000
commita7c068b9bc213c599872a0f729d736f5ff3d7866 (patch)
treeccfd93a6e316c8f0e61e8b355c69ff596234dcd6
parent5c571dc01a9f09d519be437b955ee37145f039c6 (diff)
Drupal 6.106.10
-rw-r--r--CHANGELOG.txt6
-rw-r--r--includes/common.inc2
-rw-r--r--modules/system/system.module2
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e51b3d5..b31bc66 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,8 +1,12 @@
// $Id$
-Drupal 6.10-dev, xxxx-xx-xx (development release)
+Drupal 6.10, 2009-02-25
----------------------
+- Fixed a security issue, (Local file inclusion on Windows),
+ see SA-CORE-2009-003
- Fixed node_feed() so custom fields can show up in RSS feeds.
+- Improved PostgreSQL compatibility.
+- Fixed a variety of small bugs.
Drupal 6.9, 2009-01-14
----------------------
diff --git a/includes/common.inc b/includes/common.inc
index 2118875..22ac3b2 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 13dcf54..37ee7f9 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.10-dev');
+define('VERSION', '6.10');
/**
* Core API compatibility.