summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2008-12-11 17:39:42 +0000
committerGábor Hojtsy2008-12-11 17:39:42 +0000
commit80cff5cedfe9f8a23596c1a7e1ae456c894a79ae (patch)
tree7560f543d18a760c292609d0dc4834e5df135bf2
parentb4b3a0e460befb8a6bb8b6258f246f0217a2228c (diff)
Drupal 6.86.8
-rw-r--r--CHANGELOG.txt7
-rw-r--r--includes/common.inc2
-rw-r--r--modules/system/system.module2
3 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0e84dbb..4c58b4d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,8 @@
// $Id$
-Drupal 6.8-dev, xxxx-xx-xx (development release)
+Drupal 6.8, 2008-12-11
----------------------
+- Removed a previous change incompatible with PHP 5.1.x and lower.
Drupal 6.7, 2008-12-10
----------------------
@@ -153,6 +154,10 @@ Drupal 6.0, 2008-02-13
- Removed old system updates. Updates from Drupal versions prior to 5.x will
require upgrading to 5.x before upgrading to 6.x.
+Drupal 5.14, 2008-12-11
+----------------------
+- Removed a previous change incompatible with PHP 5.1.x and lower.
+
Drupal 5.13, 2008-12-10
-----------------------
- fixed a variety of small bugs.
diff --git a/includes/common.inc b/includes/common.inc
index a6cb14a..9ae6c96 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -586,7 +586,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 0f3098f..9ff9312 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.8-dev');
+define('VERSION', '6.8');
/**
* Core API compatibility.