[wp-cvs] wordpress/wp-admin options-permalink.php,1.44,1.45

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17910/wp-admin

Modified Files:
	options-permalink.php 
Log Message:
Fix for bug 299.

Index: options-permalink.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-permalink.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** options-permalink.php	6 Oct 2004 02:18:37 -0000	1.44
--- options-permalink.php	14 Oct 2004 08:09:00 -0000	1.45
***************
*** 21,35 ****
  }
  
! if (isset($_POST['submit'])) {
! 	$permalink_structure = preg_replace('#/+/#', '/', $_POST['permalink_structure']);
  	update_option('permalink_structure', $permalink_structure);
! 
! 	update_option('category_base', $_POST['category_base']);
! 	$category_base = $_POST['category_base'];
! } else {
! 	$permalink_structure = get_settings('permalink_structure');
! 	$category_base = get_settings('category_base');
  }
  
  generate_page_rewrite_rules();
  
--- 21,43 ----
  }
  
! if ( isset($_POST) ) {
! 	if ( $_POST['permalink_structure'] )
! 		$permalink_structure = preg_replace('#/+#', '/', '/' . $_POST['permalink_structure']);
! 	else
! 		$permalink_structure = $_POST['permalink_structure'];
! 	
! 	if ( $_POST['category_base'] )
! 		$category_base = preg_replace('#/+#', '/', '/' . $_POST['category_base']);
! 	else
! 		$category_base = $_POST['category_base'];
! 	
  	update_option('permalink_structure', $permalink_structure);
! 	update_option('category_base', $category_base);
  }
  
+ $permalink_structure = get_settings('permalink_structure');
+ $category_base = get_settings('category_base');
+ 
+ 
  generate_page_rewrite_rules();