Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1410)
+++ branches/2.8.x/CHANGELOG	(revision 1411)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.2 -------------------------------------
+23 Jan-2011 Build 1411 Frank Heyne (FrankH)
+# Bugfix for Tickets 965, 966 and 910
 23 Jan-2011 Build 1410 Frank Heyne (FrankH)
 # Bugfix for build 1409
 23 Jan-2011 Build 1409 Frank Heyne (FrankH)
Index: branches/2.8.x/wb/admin/pages/settings.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings.php	(revision 1410)
+++ branches/2.8.x/wb/admin/pages/settings.php	(revision 1411)
@@ -118,7 +118,7 @@
 // Work-out if we should show the "manage sections" link
 $sql = 'SELECT `section_id` FROM `'.TABLE_PREFIX.'sections` WHERE `page_id`='.$page_id.' AND `module`="menu_link"';
 $query_sections = $database->query($sql);
-if($query_sections->numRows() > 0)
+if (isset($query_sections) && $query_sections->numRows() > 0)
 {
     $template->set_var('DISPLAY_MANAGE_SECTIONS', 'display:none;');
 } elseif(MANAGE_SECTIONS == 'enabled')
@@ -472,8 +472,7 @@
 
 $sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "template" AND `function` = "template" order by `name`';
 $result = $database->query($sql);
-
-if($result->numRows() > 0)
+if (isset($result) && $result->numRows() > 0)
 {
 	while($addon = $result->fetchRow())
     {
@@ -535,8 +534,7 @@
 
 $sql = 'SELECT * FROM `'.TABLE_PREFIX.'addons` WHERE `type` = "language" ORDER BY `name`';
 $result = $database->query($sql);
-
-if($result->numRows() > 0)
+if (isset($result) && $result->numRows() > 0)
 {
 	while($addon = $result->fetchRow())
     {
Index: branches/2.8.x/wb/admin/pages/index.php
===================================================================
--- branches/2.8.x/wb/admin/pages/index.php	(revision 1410)
+++ branches/2.8.x/wb/admin/pages/index.php	(revision 1411)
@@ -231,7 +231,7 @@
 
 					// $query_sections = $database->query("SELECT publ_start, publ_end FROM ".TABLE_PREFIX."sections WHERE page_id = '{$page['page_id']}' AND module != 'menu_link'");
 
-					if($query_sections->numRows() > 0)
+					if (isset($query_sections) && $query_sections->numRows() > 0)
                     {
 						$mdate_display=false;
 						while($mdate_res = $query_sections->fetchRow())
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1410)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1411)
@@ -52,6 +52,6 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.2.RC5');
-if(!defined('REVISION')) define('REVISION', '1410');
+if(!defined('REVISION')) define('REVISION', '1411');
 
 ?>
Index: branches/2.8.x/wb/templates/wb_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1410)
+++ branches/2.8.x/wb/templates/wb_theme/templates/settings.htt	(revision 1411)
@@ -195,12 +195,6 @@
 <!-- END show_php_error_level_block -->
 <!-- BEGIN show_wysiwyg_block -->
 <tr{DISPLAY_ADVANCED}>
-	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
-	<td class="setting_value" colspan="2">
-		<input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" />
-	</td>
-</tr>
-<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
 	<td class="setting_value" colspan="2">
 		<select name="wysiwyg_editor">
Index: branches/2.8.x/wb/templates/argos_theme/templates/settings.htt
===================================================================
--- branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1410)
+++ branches/2.8.x/wb/templates/argos_theme/templates/settings.htt	(revision 1411)
@@ -180,10 +180,6 @@
 	</td>
 </tr>
 <tr{DISPLAY_ADVANCED}>
-	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
-	<td class="setting_value" colspan="3"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>
-</tr>
-<tr{DISPLAY_ADVANCED}>
 	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
 	<td class="setting_value" colspan="3">
 		<select name="wysiwyg_editor">