Index: trunk/wb/include/htmlarea/popups/link.php
===================================================================
--- trunk/wb/include/htmlarea/popups/link.php	(revision 65)
+++ trunk/wb/include/htmlarea/popups/link.php	(revision 66)
@@ -75,7 +75,7 @@
 	global $template, $database;
 	$get_pages = $database->query("SELECT page_id,menu_title,link,level FROM ".TABLE_PREFIX."pages WHERE parent = '$parent' AND visibility!='deleted' ORDER BY position ASC");
 	while($page = $get_pages->fetchRow()) {
-		$title = $admin->strip_slashes_dummy($page['menu_title']);
+		$title = $page['menu_title'];
 		// Add leading -'s so we can tell what level a page is at
 		$leading_dashes = '';
 		for($i = 0; $i < $page['level']; $i++) {
@@ -99,7 +99,7 @@
 	$template->parse('page_list', 'page_list_block', true);
 	// Loop through pages
 	while($page = $get_pages->fetchRow()) {
-		$title = $admin->strip_slashes_dummy($page['menu_title']);
+		$title = $page['menu_title'];
 		$template->set_var('TITLE', $title);
 		$template->set_var('LINK', '[wblink'.$page['page_id'].']');
 		$template->parse('page_list', 'page_list_block', true);
Index: trunk/wb/modules/menu_link/info.php
===================================================================
--- trunk/wb/modules/menu_link/info.php	(revision 65)
+++ trunk/wb/modules/menu_link/info.php	(revision 66)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: info.php,v 1.3 2005/04/08 09:58:31 rdjurovich Exp $
+// $Id$
 
 /*
 
@@ -29,6 +29,6 @@
 $module_version = '2.5';
 $module_designed_for = '2.x';
 $module_author = 'Ryan Djurovich';
-$module_description = 'This module allows you to edit the contents of a page using the MENU_LINK htmlArea program';
+$module_description = 'This module allows you to insert a link into the menu.';
 
 ?>
\ No newline at end of file
Index: trunk/wb/modules/wysiwyg/modify.php
===================================================================
--- trunk/wb/modules/wysiwyg/modify.php	(revision 65)
+++ trunk/wb/modules/wysiwyg/modify.php	(revision 66)
@@ -23,8 +23,8 @@
 
 */
 
+if(!defined('WB_PATH')) exit('Direct access to this file is not allowed');
 
-
 // Get page content
 $query = "SELECT content FROM ".TABLE_PREFIX."mod_wysiwyg WHERE section_id = '$section_id'";
 $get_content = $database->query($query);
Index: trunk/wb/modules/news/modify_post.php
===================================================================
--- trunk/wb/modules/news/modify_post.php	(revision 65)
+++ trunk/wb/modules/news/modify_post.php	(revision 66)
@@ -132,7 +132,7 @@
 	<td valign="top"><?php echo $TEXT['SHORT']; ?>:</td>
 	<td>
 	<?php
-	show_wysiwyg_editor("short","short",$fetch_content['short'],"100%","135px");
+	show_wysiwyg_editor("short","short",$fetch_content['content_short'],"100%","135px");
 	?>
 	</td>
 </tr>
@@ -140,7 +140,7 @@
 	<td valign="top"><?php echo $TEXT['LONG']; ?>:</td>
 	<td>
 	<?php
-	show_wysiwyg_editor("long","long",$fetch_content['long'],"100%","300px");
+	show_wysiwyg_editor("long","long",$fetch_content['content_long'],"100%","300px");
 	?>
 	</td>
 </tr>
Index: trunk/wb/modules/news/save_post.php
===================================================================
--- trunk/wb/modules/news/save_post.php	(revision 65)
+++ trunk/wb/modules/news/save_post.php	(revision 66)
@@ -100,7 +100,7 @@
 }
 
 // Update row
-$database->query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '$group_id', title = '$title', link = '$post_link', short = '$short', `long` = '$long', commenting = '$commenting', active = '$active', posted_when = '".mktime()."', posted_by = '".$admin->get_user_id()."' WHERE post_id = '$post_id'");
+$database->query("UPDATE ".TABLE_PREFIX."mod_news_posts SET group_id = '$group_id', title = '$title', link = '$post_link', content_short = '$short', content_long = '$long', commenting = '$commenting', active = '$active', posted_when = '".mktime()."', posted_by = '".$admin->get_user_id()."' WHERE post_id = '$post_id'");
 
 // Check if there is a db error, otherwise say successful
 if($database->is_error()) {
Index: trunk/wb/modules/news/install.php
===================================================================
--- trunk/wb/modules/news/install.php	(revision 65)
+++ trunk/wb/modules/news/install.php	(revision 66)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: install.php,v 1.6 2005/04/02 08:21:46 rdjurovich Exp $
+// $Id$
 
 /*
 
@@ -35,8 +35,8 @@
 					 . '`position` INT NOT NULL,'
 					 . '`title` VARCHAR(255) NOT NULL,'
 					 . '`link` TEXT NOT NULL,'
-					 . '`short` TEXT NOT NULL,'
-					 . '`long` TEXT NOT NULL,'
+					 . '`content_short` TEXT NOT NULL,'
+					 . '`content_long` TEXT NOT NULL,'
 					 . '`commenting` VARCHAR(7) NOT NULL,'
 		   	    . '`posted_when` INT NOT NULL ,'
 					 . '`posted_by` INT NOT NULL ,'
@@ -107,8 +107,8 @@
 	// Query body
 	$query_body_code = "
 	[TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.title LIKE \'%[STRING]%\'
-	OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.short LIKE \'%[STRING]%\'
-	OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.long LIKE \'%[STRING]%\'
+	OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.content_short LIKE \'%[STRING]%\'
+	OR [TP]pages.page_id = [TP]mod_news_posts.page_id AND [TP]mod_news_posts.content_long LIKE \'%[STRING]%\'
 	OR [TP]pages.page_id = [TP]mod_news_comments.page_id AND [TP]mod_news_comments.title LIKE \'%[STRING]%\'
 	OR [TP]pages.page_id = [TP]mod_news_comments.page_id AND [TP]mod_news_comments.comment LIKE \'%[STRING]%\'
 	OR [TP]pages.page_id = [TP]mod_news_settings.page_id AND [TP]mod_news_settings.header LIKE \'%[STRING]%\'
Index: trunk/wb/modules/news/rss.php
===================================================================
--- trunk/wb/modules/news/rss.php	(revision 65)
+++ trunk/wb/modules/news/rss.php	(revision 66)
@@ -77,7 +77,7 @@
     echo "<item>";
     echo "<title>".$item["title"]."</title>";
     // Stripping HTML Tags for text-only visibility
-    echo "<description>".strip_tags($item["short"])."</description>";
+    echo "<description>".strip_tags($item["content_short"])."</description>";
     echo "<link>".WB_URL."/pages".$item["link"].PAGE_EXTENSION."</link>";
     /* Add further (non required) information here like ie.
     echo "<author>".$item["posted_by"]."</author>");
Index: trunk/wb/modules/news/view.php
===================================================================
--- trunk/wb/modules/news/view.php	(revision 65)
+++ trunk/wb/modules/news/view.php	(revision 66)
@@ -105,7 +105,7 @@
 	}
 	
 	// Query posts (for this page)
-	$query_posts = $database->query("SELECT group_id,post_id,title,link,short,posted_by,posted_when FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id' AND active = '1' AND title != ''$query_extra ORDER BY position DESC".$limit_sql);
+	$query_posts = $database->query("SELECT group_id,post_id,title,link,content_short,posted_by,posted_when FROM ".TABLE_PREFIX."mod_news_posts WHERE section_id = '$section_id' AND active = '1' AND title != ''$query_extra ORDER BY position DESC".$limit_sql);
 	$num_posts = $query_posts->numRows();
 	
 	// Create previous and next links
@@ -185,7 +185,7 @@
 				if($group_image == '') { $display_image = 'none'; } else { $display_image = ''; }
 				if($group_id == 0) { $display_group = 'none'; } else { $display_group = ''; }
 				// Replace [wblink--PAGE_ID--] with real link
-				$short = $this->strip_slashes_dummy($post['short']);
+				$short = $this->strip_slashes_dummy($post['content_short']);
 				$this->preprocess($short);
 				// Replace vars with values
 				$vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[LINK]', '[DATE]', '[TIME]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]', '[TEXT_READ_MORE]');
@@ -258,11 +258,11 @@
 			if($group_id == 0) { $display_group = 'none'; } else { $display_group = ''; }
 			$vars = array('[PAGE_TITLE]', '[GROUP_ID]', '[GROUP_TITLE]', '[GROUP_IMAGE]', '[DISPLAY_GROUP]', '[DISPLAY_IMAGE]', '[TITLE]', '[SHORT]', '[BACK]', '[DATE]', '[TIME]', '[USER_ID]', '[USERNAME]', '[DISPLAY_NAME]', '[EMAIL]');
 			if(isset($users[$uid]['username']) AND $users[$uid]['username'] != '') {
-				$values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $this->strip_slashes_dummy($post['title']), $this->strip_slashes_dummy($post['short']), $page_link, $post_date, $post_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email']);
+				$values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $this->strip_slashes_dummy($post['title']), $this->strip_slashes_dummy($post['content_short']), $page_link, $post_date, $post_time, $uid, $users[$uid]['username'], $users[$uid]['display_name'], $users[$uid]['email']);
 			} else {
-				$values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $this->strip_slashes_dummy($post['title']), $this->strip_slashes_dummy($post['short']), $page_link, $post_date, $post_time, '', '', '', '');
+				$values = array(PAGE_TITLE, $group_id, $group_title, $group_image, $display_group, $display_image, $this->strip_slashes_dummy($post['title']), $this->strip_slashes_dummy($post['content_short']), $page_link, $post_date, $post_time, '', '', '', '');
 			}
-			$post_long = $this->strip_slashes_dummy($post['long']);
+			$post_long = $this->strip_slashes_dummy($post['content_long']);
 		}
 	} else {
 		header('Location: '.WB_URL.'/pages/');