Index: branches/2.6.x/CHANGELOG
===================================================================
--- branches/2.6.x/CHANGELOG	(revision 497)
+++ branches/2.6.x/CHANGELOG	(revision 498)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 ------------------------------------- 2.6.6 -------------------------------------
+01-Jul-2007 Ryan Djurovich
+#	Fixed bugs introduced in [484]
 14-May-2007 Matthias Gallas
 +	Added support for ISO-8859-6.(Thanks to thorn)
 12-May-2007 Christian Sommer
Index: branches/2.6.x/wb/admin/pages/settings2.php
===================================================================
--- branches/2.6.x/wb/admin/pages/settings2.php	(revision 497)
+++ branches/2.6.x/wb/admin/pages/settings2.php	(revision 498)
@@ -115,8 +115,8 @@
 
 // Work-out what the link should be
 if($parent == '0') {
-	$link = '/'.page_filename($page_title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($page_title).PAGE_EXTENSION; 
+	$link = '/'.page_filename($menu_title);
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.page_filename($menu_title).'.php'; 
 } else {
 	$parent_section = '';
 	$parent_titles = array_reverse(get_parent_titles($parent));
@@ -124,8 +124,8 @@
 		$parent_section .= page_filename($parent_title).'/';
 	}
 	if($parent_section == '/') { $parent_section = ''; }
-	$link = '/'.$parent_section.page_filename($page_title);
-	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($page_title).PAGE_EXTENSION;  
+	$link = '/'.$parent_section.page_filename($menu_title);
+	$filename = WB_PATH.PAGES_DIRECTORY.'/'.$parent_section.page_filename($menu_title).'.php';  
 }
 
 // Check if a page with same page filename exists
@@ -167,7 +167,10 @@
 	// First check if we need to create a new file
 	if($old_link != $link) {
 		// Delete old file
-		unlink(WB_PATH.PAGES_DIRECTORY.$old_link.PAGE_EXTENSION);
+		$old_filename = WB_PATH.PAGES_DIRECTORY.$old_link.'.php';
+		if(file_exists($old_filename)) {
+			unlink($old_filename);
+		}
 		// Create access file
 		create_access_file($filename,$page_id,$level);
 		// Move a directory for this page