Index: trunk/wb/admin/pages/settings.php
===================================================================
--- trunk/wb/admin/pages/settings.php	(revision 395)
+++ trunk/wb/admin/pages/settings.php	(revision 396)
@@ -74,8 +74,8 @@
 $template->set_block('page', 'main_block', 'main');
 $template->set_var(array(
 								'PAGE_ID' => $results_array['page_id'],
-								'PAGE_TITLE' => ($results_array['page_title']),
-								'MENU_TITLE' => ($results_array['menu_title']),
+								'PAGE_TITLE' => (htmlentities($results_array['page_title'])),
+								'MENU_TITLE' => (htmlentities($results_array['menu_title'])),
 								'DESCRIPTION' => ($results_array['description']),
 								'KEYWORDS' => ($results_array['keywords']),
 								'MODIFIED_BY' => $user['display_name'],
@@ -247,7 +247,7 @@
 			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; }
 			$template->set_var(array(
 											'ID' => $page['page_id'],
-											'TITLE' => ($title_prefix.$page['page_title'])
+											'TITLE' => ($title_prefix.htmlentities($page['page_title']))
 											)
 									);
 			if($results_array['parent'] == $page['page_id']) {
Index: trunk/wb/admin/pages/index.php
===================================================================
--- trunk/wb/admin/pages/index.php	(revision 395)
+++ trunk/wb/admin/pages/index.php	(revision 396)
@@ -164,15 +164,15 @@
 				</td>
 				<?php if($admin->get_permission('pages_modify') == true AND $can_modify == true) { ?>
 				<td>
-					<a href="<?php echo ADMIN_URL; ?>/pages/modify.php?page_id=<?php echo $page['page_id']; ?>" title="<?php echo $TEXT['MODIFY']; ?>"><?php echo ($page['page_title']); ?></a>
+					<a href="<?php echo ADMIN_URL; ?>/pages/modify.php?page_id=<?php echo $page['page_id']; ?>" title="<?php echo $TEXT['MODIFY']; ?>"><?php echo (htmlentities($page['page_title'])); ?></a>				
 				</td>
 				<?php } else { ?>
 				<td>
-					<?php	echo ($page['page_title']); ?>
+					<?php echo (htmlentities($page['page_title'])); ?>
 				</td>
 				<?php } ?>
 				<td align="left" width="232">
-					<font color="#999999"><?php echo ($page['menu_title']); ?></font>
+					<font color="#999999"><?php echo (htmlentities($page['menu_title'])); ?></font>
 				</td>
 				<td align="center" valign="middle" width="90">
 				<?php if($page['visibility'] == 'public') { ?>
@@ -460,7 +460,7 @@
 			for($i = 1; $i <= $page['level']; $i++) { $title_prefix .= ' - '; }
 				$template->set_var(array(
 												'ID' => $page['page_id'],
-												'TITLE' => ($title_prefix.$page['page_title'])
+												'TITLE' => ($title_prefix.htmlentities($page['page_title']))
 												)
 										);
 				if($can_modify == true) {
Index: trunk/wb/admin/pages/trash.php
===================================================================
--- trunk/wb/admin/pages/trash.php	(revision 395)
+++ trunk/wb/admin/pages/trash.php	(revision 396)
@@ -141,21 +141,21 @@
 				</td>
 				<?php if($admin->get_permission('pages_modify') == true AND $can_modify == true AND $page['visibility'] != 'heading') { ?>
 				<td>
-					<a href="<?php echo ADMIN_URL; ?>/pages/modify.php?page_id=<?php echo $page['page_id']; ?>" title="<?php echo $TEXT['MODIFY']; ?>"><?php echo ($page['page_title']); ?></a>
+					<a href="<?php echo ADMIN_URL; ?>/pages/modify.php?page_id=<?php echo $page['page_id']; ?>" title="<?php echo $TEXT['MODIFY']; ?>"><?php echo (htmlentities($page['page_title'])); ?></a>
 				</td>
 				<?php } else { ?>
 				<td>
 					<?php
 					if($page['visibility'] != 'heading') {
-						echo ($page['page_title']);
+						echo (htmlentities($page['page_title']));
 					} else {
-						echo '<b>'.($page['page_title']).'</b>';
+						echo '<b>'.(htmlentities($page['page_title'])).'</b>';
 					}
 					?>
 				</td>
 				<?php } ?>
 				<td align="left" width="232">
-					<font color="#999999"><?php echo $page['menu_title']; ?></font>
+					<font color="#999999"><?php echo htmlentities($page['menu_title']); ?></font>
 				</td>
 				<td align="right" valign="middle" width="30" style="padding-right: 20px;">
 				<?php if($page['visibility'] == 'public') { ?>
Index: trunk/wb/admin/pages/settings2.php
===================================================================
--- trunk/wb/admin/pages/settings2.php	(revision 395)
+++ trunk/wb/admin/pages/settings2.php	(revision 396)
@@ -40,8 +40,8 @@
 require_once(WB_PATH.'/framework/functions.php');
 
 // Get values
-$page_title = $admin->add_slashes($admin->get_post('page_title'));
-$menu_title = $admin->add_slashes($admin->get_post('menu_title'));
+$page_title = $admin->add_slashes($admin->get_post_escaped('page_title'));
+$menu_title = $admin->add_slashes($admin->get_post_escaped('menu_title'));
 $description = $admin->add_slashes($admin->get_post('description'));
 $keywords = $admin->add_slashes($admin->get_post('keywords'));
 $parent = $admin->get_post('parent');
Index: trunk/wb/admin/pages/sections.php
===================================================================
--- trunk/wb/admin/pages/sections.php	(revision 395)
+++ trunk/wb/admin/pages/sections.php	(revision 396)
@@ -136,7 +136,7 @@
 	</td>
 	<td align="right">
 		<?php echo $TEXT['CURRENT_PAGE']; ?>: 
-		<b><?php echo ($results_array['page_title']); ?></b>
+		<b><?php echo (htmlentities($results_array['page_title'])); ?></b>
 		-
 		<a href="<?php echo ADMIN_URL; ?>/pages/modify.php?page_id=<?php echo $page_id; ?>"><?php echo $HEADING['MODIFY_PAGE']; ?></a>
 		-
Index: trunk/wb/admin/pages/modify.php
===================================================================
--- trunk/wb/admin/pages/modify.php	(revision 395)
+++ trunk/wb/admin/pages/modify.php	(revision 396)
@@ -60,7 +60,7 @@
 $template->set_block('page', 'main_block', 'main');
 $template->set_var(array(
 								'PAGE_ID' => $results_array['page_id'],
-								'PAGE_TITLE' => ($results_array['page_title']),
+								'PAGE_TITLE' => (htmlentities($results_array['page_title'])),
 								'MODIFIED_BY' => $user['display_name'],
 								'MODIFIED_BY_USERNAME' => $user['username'],
 								'MODIFIED_WHEN' => $modified_ts,
Index: trunk/wb/admin/pages/add.php
===================================================================
--- trunk/wb/admin/pages/add.php	(revision 395)
+++ trunk/wb/admin/pages/add.php	(revision 396)
@@ -32,7 +32,7 @@
 require_once(WB_PATH.'/framework/functions.php');
 
 // Get values
-$title = $admin->add_slashes($admin->get_post('title'));
+$title = $admin->add_slashes($admin->get_post_escaped('title'));
 $module = $admin->get_post('type');
 $parent = $admin->get_post('parent');
 $visibility = $admin->get_post('visibility');
Index: trunk/wb/framework/class.frontend.php
===================================================================
--- trunk/wb/framework/class.frontend.php	(revision 395)
+++ trunk/wb/framework/class.frontend.php	(revision 396)
@@ -139,10 +139,10 @@
 			// Page ID
 			define('PAGE_ID', $this->page['page_id']);
 			// Page Title
-			define('PAGE_TITLE', ($this->page['page_title']));
+			define('PAGE_TITLE', htmlentities(($this->page['page_title'])));
 			$this->page_title=PAGE_TITLE;
 			// Menu Title
-			$menu_title = ($this->page['menu_title']);
+			$menu_title = htmlentities($this->page['menu_title']);
 			if($menu_title != '') {
 				define('MENU_TITLE', $menu_title);
 			} else {
@@ -353,7 +353,7 @@
 	            $link = $this->page_link($page['link']);
 	         }
 	         // Create values
-	         $values = array($class,'<a href="'.$link.'" target="'.$page['target'].'" '.$class.'>', '</a>', ($page['menu_title']), ($page['page_title']));
+	         $values = array($class,'<a href="'.$link.'" target="'.$page['target'].'" '.$class.'>', '</a>', htmlentities($page['menu_title']), htmlentities($page['page_title']));
 	         // Replace vars with value and print
 	         echo "\n".str_replace($vars, $values, $this->menu_item_template);
 	         // Generate sub-menu
Index: trunk/wb/framework/frontend.functions.php
===================================================================
--- trunk/wb/framework/frontend.functions.php	(revision 395)
+++ trunk/wb/framework/frontend.functions.php	(revision 396)
@@ -197,9 +197,9 @@
 					$query_menu=$database->query("SELECT menu_title,link FROM ".TABLE_PREFIX."pages WHERE page_id=$temp");
 					$page=$query_menu->fetchRow();
 					if ($links==true AND $temp!=$page_id)
-						echo '<a href="'.page_link($page['link']).'">'.$page['menu_title'].'</a>';
+						echo '<a href="'.page_link($page['link']).'">'.htmlentities($page['menu_title']).'</a>';
 					else
-					    echo $page['menu_title'];
+					    echo htmlentities($page['menu_title']);
 		        }
 	            $counter++;
 			}