Index: trunk/wb/admin/pages/settings2.php
===================================================================
--- trunk/wb/admin/pages/settings2.php	(revision 550)
+++ trunk/wb/admin/pages/settings2.php	(revision 551)
@@ -150,12 +150,6 @@
 // Get page trail
 $page_trail = get_page_trail($page_id);
 
-// Make sure link is not overwritten if page uses the menu link module
-$query_sections = $database->query("SELECT section_id FROM ".TABLE_PREFIX."sections WHERE page_id = '$page_id' AND module = 'menu_link'");
-if($query_sections->numRows() > 0) {
-	$link = $old_link;
-} 
-
 // Update page settings in the pages table
 $query = "UPDATE ".TABLE_PREFIX."pages SET parent = '$parent', page_title = '$page_title', menu_title = '$menu_title', menu = '$menu', level = '$level', page_trail = '$page_trail', root_parent = '$root_parent', link = '$link', template = '$template', target = '$target', description = '$description', keywords = '$keywords', position = '$position', visibility = '$visibility', searching = '$searching', language = '$language', admin_groups = '$admin_groups', viewing_groups = '$viewing_groups' WHERE page_id = '$page_id'";
 $database->query($query);
Index: trunk/wb/framework/functions.php
===================================================================
--- trunk/wb/framework/functions.php	(revision 550)
+++ trunk/wb/framework/functions.php	(revision 551)
@@ -1197,12 +1197,12 @@
 	$directory = WB_PATH.PAGES_DIRECTORY.$link;
 	$filename = $directory.'.php';
 	$directory .= '/';
-	if(file_exists($filename) && substr($filename,0,1<>'.')) {
+	if(file_exists($filename)) {
 		if(!is_writable(WB_PATH.PAGES_DIRECTORY.'/')) {
 			$admin->print_error($MESSAGE['PAGES']['CANNOT_DELETE_ACCESS_FILE']);
 		} else {
 			unlink($filename);
-			if(file_exists($directory)) {
+			if(file_exists($directory) && rtrim($directory,'/')!=WB_PATH.PAGES_DIRECTORY) {
 				rm_full_dir($directory);
 			}
 		}