summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-09-15 07:33:46 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-09-15 07:33:46 +0000
commit9c2f47eafd1aafbcc5cd2aa58b5e6c069f78c8dd (patch)
tree2f3712a49409c64c0adbef8959a7a74654a803f6
parent86a6cd4ef3c80c882c3f279f0823327e5da8b03c (diff)
downloadbrdo-9c2f47eafd1aafbcc5cd2aa58b5e6c069f78c8dd.tar.gz
brdo-9c2f47eafd1aafbcc5cd2aa58b5e6c069f78c8dd.tar.bz2
Back to devopment version, now that we have the beta 1 tagged and released
-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 ca4a79150..c5bb00e65 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
// $Id$
-Drupal 6.0 beta 1, 2007-09-14
+Drupal 6.0, xxxx-xx-xx (development version)
----------------------
- New, faster and better menu system.
- New watchdog as a hook functionality.
diff --git a/includes/common.inc b/includes/common.inc
index f642515f2..d781cbc4d 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 ^ E_NOTICE)) {
+ if ($errno & (E_ALL)) {
$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 cb0da0a74..369de9289 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-beta1');
+define('VERSION', '6.0-dev');
define('DRUPAL_CORE_COMPATIBILITY', '6.x');
define('DRUPAL_MINIMUM_PHP', '4.3.3');