[wp-cvs] wordpress/wp-includes functions.php,1.142,1.143

[Ryan Boren]

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

Modified Files:
	functions.php 
Log Message:
Search permalinks complete with feed and paging support.

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** functions.php	11 Aug 2004 01:55:34 -0000	1.142
--- functions.php	18 Aug 2004 21:05:34 -0000	1.143
***************
*** 1207,1211 ****
  	'%category%',
  	'%author%',
! 	'%pagename%'
  	);
  
--- 1207,1212 ----
  	'%category%',
  	'%author%',
! 	'%pagename%',
! 	'%search%'
  	);
  
***************
*** 1223,1226 ****
--- 1224,1228 ----
  	'([_0-9a-z-]+)',
  	'([_0-9a-z-]+)',
+ 	'(.+)'
  	);
  
***************
*** 1237,1241 ****
  	'category_name=',
  	'author_name=',
! 	'pagename=',    
  	);
  
--- 1239,1244 ----
  	'category_name=',
  	'author_name=',
! 	'pagename=',
! 	's='
  	);
  
***************
*** 1364,1367 ****
--- 1367,1374 ----
                       );
  
+     // Search
+     $search_structure = $prefix . "search/%search%";
+     $search_rewrite = generate_rewrite_rules($search_structure, $matches);
+ 
      // Categories
  	if ( '' == get_settings('category_base') )
***************
*** 1382,1386 ****
  
      // Put them together.
!     $rewrite = $site_rewrite + $page_rewrite + $category_rewrite + $author_rewrite;
  
      // Add on archive rewrite rules if needed.
--- 1389,1393 ----
  
      // Put them together.
!     $rewrite = $site_rewrite + $page_rewrite + $search_rewrite + $category_rewrite + $author_rewrite;
  
      // Add on archive rewrite rules if needed.