summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2010-06-02 18:58:25 (GMT)
committer Gábor Hojtsy2010-06-02 18:58:25 (GMT)
commit9eaba2c9bb66c348630f7133d6ed69e2c893a96d (patch)
tree086193e36ad6b42f0fed3476308c721dc7b71f90
parenta09fcca0294ef62ba7b1c7ec2af2980f0a39d3e1 (diff)
Now onto Drupal 6.18
-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 02a239e..fbf37ef 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,8 @@
// $Id$
+Drupal 6.18-dev, xxxx-xx-xx (development release)
+----------------------
+
Drupal 6.17, 2010-06-02
----------------------
- Improved PostgreSQL compatibility
diff --git a/includes/common.inc b/includes/common.inc
index 0ca24f9..3fb5577 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 ^ 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 9c54a60..b805c02 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.17');
+define('VERSION', '6.18-dev');
/**
* Core API compatibility.