Index: trunk/wb/search/index.php
===================================================================
--- trunk/wb/search/index.php	(revision 107)
+++ trunk/wb/search/index.php	(revision 108)
@@ -25,10 +25,7 @@
 
 // Include the config file
 require('../config.php');
-require_once(WB_PATH."/framework/class.frontend.php");
-$wb = new frontend();
 
-
 // Required page details
 $page_id = 0;
 $page_description = '';
@@ -43,10 +40,6 @@
 define('VISIBILITY', 'public');
 define('PAGE_CONTENT', 'search.php');
 
-
-// Include database class file
-require_once(WB_PATH.'/framework/class.database.php');
-
 // Find out what the search template is
 $database = new database();
 $query_template = $database->query("SELECT value FROM ".TABLE_PREFIX."search WHERE name = 'template' LIMIT 1");
Index: trunk/wb/framework/class.frontend.php
===================================================================
--- trunk/wb/framework/class.frontend.php	(revision 107)
+++ trunk/wb/framework/class.frontend.php	(revision 108)
@@ -58,10 +58,6 @@
 	// ugly database stuff
 	var $extra_where_sql;
 
-	function frontend() {
-		$this->wb();
-	}
-	
 	function page_select() {
 		global $page_id,$no_intro;
 		global $database;
Index: trunk/wb/index.php
===================================================================
--- trunk/wb/index.php	(revision 107)
+++ trunk/wb/index.php	(revision 108)
@@ -35,8 +35,7 @@
 
 require_once(WB_PATH.'/framework/class.frontend.php');
 // Create new frontend object
-// Perform general initializations
-if (!isset($wb)) $wb = new frontend();
+$wb = new frontend();
 
 // Figure out which page to display
 // Stop processing if intro page was shown