[wp-cvs] wordpress/wp-admin admin-functions.php, 1.59, 1.60 options-permalink.php, 1.49, 1.50

[Ryan Boren]

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

Modified Files:
	admin-functions.php options-permalink.php 
Log Message:
Move rewrite and permalink functions into WP_Rewrite class.

Index: options-permalink.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-permalink.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** options-permalink.php	19 Nov 2004 20:54:16 -0000	1.49
--- options-permalink.php	3 Dec 2004 02:38:11 -0000	1.50
***************
*** 22,26 ****
  		if (! empty($permalink_structure) )
  			$permalink_structure = preg_replace('#/+#', '/', '/' . $_POST['permalink_structure']);
! 		update_option('permalink_structure', $permalink_structure);
  	}
  	
--- 22,26 ----
  		if (! empty($permalink_structure) )
  			$permalink_structure = preg_replace('#/+#', '/', '/' . $_POST['permalink_structure']);
! 		$wp_rewrite->set_permalink_structure($permalink_structure);
  	}
  	
***************
*** 29,33 ****
  		if (! empty($category_base) )
  			$category_base = preg_replace('#/+#', '/', '/' . $_POST['category_base']);
! 		update_option('category_base', $category_base);
  	}
  }
--- 29,33 ----
  		if (! empty($category_base) )
  			$category_base = preg_replace('#/+#', '/', '/' . $_POST['category_base']);
! 		$wp_rewrite->set_category_base($category_base);
  	}
  }
***************
*** 36,41 ****
  $category_base = get_settings('category_base');
  
- get_date_permastruct();
- 
  generate_page_rewrite_rules();
  
--- 36,39 ----
***************
*** 45,49 ****
  	$writable = false;
  
! if ( strstr($permalink_structure, 'index.php') ) // If they're using 
  	$usingpi = true;
  else
--- 43,47 ----
  	$writable = false;
  
! if ($wp_rewrite->using_index_permalinks())
  	$usingpi = true;
  else
***************
*** 107,111 ****
  <form action="options-permalink.php" method="post">
     <p>
! <textarea rows="5" style="width: 98%;" name="rules"><?php echo mod_rewrite_rules($permalink_structure); ?>
  </textarea>
      </p>
--- 105,109 ----
  <form action="options-permalink.php" method="post">
     <p>
! <textarea rows="5" style="width: 98%;" name="rules"><?php echo $wp_rewrite->mod_rewrite_rules(); ?>
  </textarea>
      </p>

Index: admin-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-functions.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** admin-functions.php	28 Nov 2004 00:33:03 -0000	1.59
--- admin-functions.php	3 Dec 2004 02:38:10 -0000	1.60
***************
*** 491,495 ****
  
  function save_mod_rewrite_rules() {
! 	global $is_apache;
  	$home = get_settings('home');
  	if ( $home != '' && $home != get_settings('siteurl') ) {
--- 491,495 ----
  
  function save_mod_rewrite_rules() {
! 	global $is_apache, $wp_rewrite;
  	$home = get_settings('home');
  	if ( $home != '' && $home != get_settings('siteurl') ) {
***************
*** 507,513 ****
  		$writable = false;
  
! 	$permalink_structure = get_settings('permalink_structure');
! 
! 	if ( strstr($permalink_structure, 'index.php') ) // If they're using 
  		$usingpi = true;
  	else
--- 507,511 ----
  		$writable = false;
  
! 	if ($wp_rewrite->using_index_permalinks())
  		$usingpi = true;
  	else
***************
*** 515,519 ****
  
  	if ( $writable && !$usingpi && $is_apache ) {
! 		$rules = explode("\n", mod_rewrite_rules($permalink_structure));
  		insert_with_markers($home_path.'.htaccess', 'WordPress', $rules);
  	}
--- 513,517 ----
  
  	if ( $writable && !$usingpi && $is_apache ) {
! 		$rules = explode("\n", $wp_rewrite->mod_rewrite_rules());
  		insert_with_markers($home_path.'.htaccess', 'WordPress', $rules);
  	}