summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2012-02-29 16:50:56 (GMT)
committer Gábor Hojtsy2012-02-29 16:50:56 (GMT)
commitcf1c0c61600ae43143343307ad080664e1c6a7ac (patch)
tree1a29e18b09017fd8ec2c00d5e8904a81a7269bca
parent7e8649f761e0279e07b2050a7ec61097636f269b (diff)
Now onto 6.25-dev
-rw-r--r--CHANGELOG.txt3
-rw-r--r--includes/common.inc2
-rw-r--r--modules/system/system.module2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c244168..43bd32a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,7 @@
+Drupal 6.26-dev, xxxx-xx-xx (development release)
+----------------------
+
Drupal 6.25, 2012-02-29
----------------------
- Fixed regressions introduced in Drupal 6.24 only.
diff --git a/includes/common.inc b/includes/common.inc
index 07be8e7..58fe6ae 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -660,7 +660,7 @@ function drupal_error_handler($errno, $message, $filename, $line, $context) {
return;
}
- if ($errno & (E_ALL ^ E_DEPRECATED ^ E_NOTICE)) {
+ if ($errno & (E_ALL ^ E_DEPRECATED)) {
$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 8061c5e..0e29e13 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -8,7 +8,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.25');
+define('VERSION', '6.26-dev');
/**
* Core API compatibility.