Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 842)
+++ trunk/CHANGELOG	(revision 843)
@@ -10,12 +10,14 @@
 # = Bugfix
 ! = Update/Change
 
-------------------------------------- 2.7.1 -------------------------------------
-04-May-2008 Thomas Hornik
-! changed register_backend_modfile() to work with wysiwyg-module, too
-01-May-2008 Thomas Hornik
-#	fixed file-naming issue when old page-names (from before 2.7) contains "&"
-26-Apr-2008 Thomas Hornik
+------------------------------------- 2.7.1 -------------------------------------
+24-May-2008 Christian Sommer
+! modified output filter routine to prevent errors if database entries do not exist
+04-May-2008 Thomas Hornik
+! changed register_backend_modfile() to work with wysiwyg-module, too
+01-May-2008 Thomas Hornik
+#	fixed file-naming issue when old page-names (from before 2.7) contains "&"
+26-Apr-2008 Thomas Hornik
 #	class.admin.php deletes actual query-string while redirection. fixed.
 25-Apr-2008 Matthias Gallas
 #	fixed validiation bug in option fields of form modul
Index: trunk/wb/modules/output_filter/filter-routines.php
===================================================================
--- trunk/wb/modules/output_filter/filter-routines.php	(revision 842)
+++ trunk/wb/modules/output_filter/filter-routines.php	(revision 843)
@@ -32,7 +32,7 @@
 		global $database, $admin;
 		// connect to database and read out filter settings
 		$result = $database->query("SELECT * FROM " .TABLE_PREFIX ."mod_output_filter");
-		if($result->numRows() > 0) {
+		if($result && $result->numRows() > 0) {
 			// get all data
 			$data = $result->fetchRow();
 			$filter_settings['email_filter'] = $admin->strip_slashes($data['email_filter']);