Index: trunk/core/kernel/startup.php
===================================================================
diff -u -N -r3282 -r3330
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 3282)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 3330)
@@ -93,14 +93,7 @@
 	// up to here
 
 	// global constants
-	define('HAVING_FILTER', 1);
-	define('WHERE_FILTER', 2);
-	
-	define('FLT_TYPE_AND',	'AND');
-	define('FLT_TYPE_OR',	'OR');
-	
-	safeDefine('STATUS_DISABLED', 0);
-	safeDefine('STATUS_ACTIVE', 1);
-	safeDefine('STATUS_PENDING', 2);
+	define ('FALSE_ON_NULL', 1);
+	define ('EMPTY_ON_NULL', 2);
 
 ?>
\ No newline at end of file