summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2012-05-02 16:36:16 (GMT)
committer Gábor Hojtsy2012-05-02 16:36:16 (GMT)
commit9260bc47d39971738f6d489554a4eb22c8c8e85e (patch)
tree1022feefcc03de072691e1ee56a012d02be2a8d0
parent79d32fc3ee1228e438dea94cbec66b41286b034e (diff)
Drupal 6.266.26
-rw-r--r--CHANGELOG.txt4
-rw-r--r--includes/common.inc2
-rw-r--r--modules/system/system.module2
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 43bd32a..d0e6d64 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
-Drupal 6.26-dev, xxxx-xx-xx (development release)
+Drupal 6.26, 2012-05-02
----------------------
+- Fixed a small number of bugs.
+- Made code documentation improvements.
Drupal 6.25, 2012-02-29
----------------------
diff --git a/includes/common.inc b/includes/common.inc
index 7d0bf85..b86f2d2 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -663,7 +663,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 0e29e13..31e6302 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.26-dev');
+define('VERSION', '6.26');
/**
* Core API compatibility.