Index: trunk/wb/admin/pages/settings2.php
===================================================================
--- trunk/wb/admin/pages/settings2.php	(revision 487)
+++ trunk/wb/admin/pages/settings2.php	(revision 488)
@@ -40,9 +40,9 @@
 require_once(WB_PATH.'/framework/functions.php');
 
 // Get values
-$page_title = $admin->add_slashes($admin->get_post_escaped('page_title'));
+$page_title = $admin->get_post_escaped('page_title');
 $page_title = my_htmlspecialchars($page_title);
-$menu_title = $admin->add_slashes($admin->get_post_escaped('menu_title'));
+$menu_title = $admin->get_post_escaped('menu_title');
 $menu_title = my_htmlspecialchars($menu_title);
 $description = $admin->add_slashes($admin->get_post('description'));
 $keywords = $admin->add_slashes($admin->get_post('keywords'));
Index: trunk/wb/admin/pages/add.php
===================================================================
--- trunk/wb/admin/pages/add.php	(revision 487)
+++ trunk/wb/admin/pages/add.php	(revision 488)
@@ -32,7 +32,7 @@
 require_once(WB_PATH.'/framework/functions.php');
 
 // Get values
-$title = $admin->add_slashes($admin->get_post_escaped('title'));
+$title = $admin->get_post_escaped('title');
 $title = my_htmlspecialchars($title);
 $module = $admin->get_post('type');
 $parent = $admin->get_post('parent');
Index: trunk/wb/framework/convert.php
===================================================================
--- trunk/wb/framework/convert.php	(revision 487)
+++ trunk/wb/framework/convert.php	(revision 488)
@@ -50,7 +50,7 @@
 '&#154;'=>'s',
 '&#159;'=>'Y',
 '&copy;'=>'(c)','&reg;'=>'(r)','&ETH;'=>'D','&times;'=>'x','&Oslash;'=>'O','&THORN;'=>'TH','&eth;'=>'d','&oslash;'=>'o','&thorn;'=>'th',
-
+'&#039;'=>'-','&quot;'=>'-',
 // latin extended-A
 '&#256;'=>'A','&#257;'=>'a','&#258;'=>'A','&#259;'=>'a','&#260;'=>'A','&#261;'=>'a',
 '&#262;'=>'C','&#263;'=>'c','&#264;'=>'C','&#265;'=>'c','&#269;'=>'c','&#268;'=>'C','&#267;'=>'c','&#266;'=>'C',
