summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2007-09-14 20:08:59 +0000
committerGábor Hojtsy2007-09-14 20:08:59 +0000
commit86a6cd4ef3c80c882c3f279f0823327e5da8b03c (patch)
tree8446cba10a2b854c5e0f2e0265fee0a1a1fb2696
parent23778cc0c0107699a4b93584dd9e7d03bc42d5d0 (diff)
Marking code as beta 1 in preparation of the first beta release of Drupal 6, also add back E_NOTICE removal for the release.6.0-beta-1
-rw-r--r--CHANGELOG.txt2
-rw-r--r--includes/common.inc2
-rw-r--r--modules/system/system.module2
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c5bb00e..ca4a791 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
// $Id$
-Drupal 6.0, xxxx-xx-xx (development version)
+Drupal 6.0 beta 1, 2007-09-14
----------------------
- New, faster and better menu system.
- New watchdog as a hook functionality.
diff --git a/includes/common.inc b/includes/common.inc
index d781cbc..f642515 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -543,7 +543,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');
// 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 369de92..cb0da0a 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -6,7 +6,7 @@
* Configuration system that lets administrators modify the workings of the site.
*/
-define('VERSION', '6.0-dev');
+define('VERSION', '6.0-beta1');
define('DRUPAL_CORE_COMPATIBILITY', '6.x');
define('DRUPAL_MINIMUM_PHP', '4.3.3');