summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2010-12-15 21:11:23 (GMT)
committer Gábor Hojtsy2010-12-15 21:11:23 (GMT)
commit8636b1234c84a07f0f087ca5d64483c4fc7b2256 (patch)
tree37dd77f2df3855e1b486717bbbbdf2f8b670d455
parentd2238f0923e24127c9c22b5038dadd3bcee1ab85 (diff)
Drupal 6.206.20
-rw-r--r--CHANGELOG.txt3
-rw-r--r--includes/common.inc2
-rw-r--r--modules/system/system.module2
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 63da664..a7eb7a8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,8 @@
// $Id$
-Drupal 6.20-dev, xxxx-xx-xx (development release)
+Drupal 6.20, 2010-12-15
----------------------
+- Fixed a variety of small bugs, improved code documentation.
Drupal 6.19, 2010-08-11
----------------------
diff --git a/includes/common.inc b/includes/common.inc
index 73d97f1..cf70d22 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -631,7 +631,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) {
return;
}
- if ($errno & (E_ALL ^ E_DEPRECATED)) {
+ if ($errno & (E_ALL ^ E_DEPRECATED ^ 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 932ab2a..e55666c 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.20-dev');
+define('VERSION', '6.20');
/**
* Core API compatibility.