Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 58)
+++ trunk/CHANGELOG	(revision 59)
@@ -12,6 +12,7 @@
 
 ------------------------------------- 2.6.0 -------------------------------------
 09-Sep-2005 Stefan Braunewell
+#	Fixed missing parent option 'none' - ticket #12 - and a minor scope bug.
 +	Added breadcrumbs code. Call using $wb->breadcrumbs().
 +	Added utf-8 character encoding meta tag into all stock templates.
 -/!	Removed initialize.php again, initialization now takes place in
Index: trunk/wb/admin/pages/settings.php
===================================================================
--- trunk/wb/admin/pages/settings.php	(revision 58)
+++ trunk/wb/admin/pages/settings.php	(revision 59)
@@ -249,29 +249,29 @@
 			// Title -'s prefix
 			$title_prefix = '';
 			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; }
-				$template->set_var(array(
-												'ID' => $page['page_id'],
-												'TITLE' => $admin->strip_slashes_dummy($title_prefix.$page['page_title'])
-												)
-										);
-				if($results_array['parent'] == $page['page_id']) {
-					$template->set_var('SELECTED', ' selected');
-				} elseif($results_array['page_id'] == $page['page_id']) {
-					$template->set_var('SELECTED', ' disabled');
-					$list_next_level=false;
-				} elseif($can_modify != true) {
-					$template->set_var('SELECTED', ' disabled');
-				} else {
-					$template->set_var('SELECTED', '');
-				}
-				$template->parse('page_list2', 'page_list_block2', true);
+			$template->set_var(array(
+											'ID' => $page['page_id'],
+											'TITLE' => $admin->strip_slashes_dummy($title_prefix.$page['page_title'])
+											)
+									);
+			if($results_array['parent'] == $page['page_id']) {
+				$template->set_var('SELECTED', ' selected');
+			} elseif($results_array['page_id'] == $page['page_id']) {
+				$template->set_var('SELECTED', ' disabled');
+				$list_next_level=false;
+			} elseif($can_modify != true) {
+				$template->set_var('SELECTED', ' disabled');
+			} else {
+				$template->set_var('SELECTED', '');
 			}
+			$template->parse('page_list2', 'page_list_block2', true);
+		}
 		if ($list_next_level)
 			parent_list($page['page_id']);
 	}
 }
 $template->set_block('main_block', 'page_list_block2', 'page_list2');
-if($admin->get_permission('pages_add_l0') == true) {
+if($admin->get_permission('pages_add_l0') == true OR $results_array['level'] == 0) {
 	if($results_array['parent'] == 0) { $selected = ' selected'; } else { $selected = ''; }
 	$template->set_var(array(
 									'ID' => '0',
Index: trunk/wb/framework/class.wb.php
===================================================================
--- trunk/wb/framework/class.wb.php	(revision 58)
+++ trunk/wb/framework/class.wb.php	(revision 59)
@@ -30,6 +30,8 @@
 This class is the basis for admin and frontend classes.
 
 */
+require_once(WB_PATH.'/framework/class.database.php');
+		
 
 class wb
 {	
@@ -39,7 +41,6 @@
 		// set global database variable
 		global $database;
 		// Create database class
-		require_once(WB_PATH.'/framework/class.database.php');
 		$database = new database();
 		$this->database = $database;