[wp-cvs] wordpress/wp-includes classes.php, 1.5, 1.6 functions.php, 1.141, 1.142 template-functions-links.php, 1.24, 1.25

[Ryan Boren]

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

Modified Files:
	classes.php functions.php template-functions-links.php 
Log Message:
Add pagename query var.

Index: template-functions-links.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-links.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** template-functions-links.php	10 Aug 2004 05:35:59 -0000	1.24
--- template-functions-links.php	11 Aug 2004 01:55:34 -0000	1.25
***************
*** 35,41 ****
          '%monthnum%',
          '%day%',
! 		'%hour%',
! 		'%minute%',
! 		'%second%',
          '%postname%',
          '%post_id%',
--- 35,41 ----
          '%monthnum%',
          '%day%',
! 	'%hour%',
! 	'%minute%',
! 	'%second%',
          '%postname%',
          '%post_id%',

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.141
retrieving revision 1.142
diff -C2 -d -r1.141 -r1.142
*** functions.php	10 Aug 2004 05:35:59 -0000	1.141
--- functions.php	11 Aug 2004 01:55:34 -0000	1.142
***************
*** 1205,1210 ****
  	'%postname%',
  	'%post_id%',
!     '%category%',
!     '%author%',
  	'%pagename%'
  	);
--- 1205,1210 ----
  	'%postname%',
  	'%post_id%',
! 	'%category%',
! 	'%author%',
  	'%pagename%'
  	);
***************
*** 1235,1241 ****
  	'name=',
  	'p=',
!     'category_name=',
!     'author_name=',
! 	'static=1&name=',    
  	);
  
--- 1235,1241 ----
  	'name=',
  	'p=',
! 	'category_name=',
! 	'author_name=',
! 	'pagename=',    
  	);
  

Index: classes.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** classes.php	10 Aug 2004 05:35:59 -0000	1.5
--- classes.php	11 Aug 2004 01:55:34 -0000	1.6
***************
*** 221,226 ****
--- 221,233 ----
              $q['name'] = preg_replace('/[^a-z0-9-_]/', '', $q['name']);
              $where .= " AND post_name = '" . $q['name'] . "'";
+         } else if ('' != $q['pagename']) {
+ 	    // If pagename is set, set static to true and set name to pagename.
+ 	    $q['pagename'] = preg_replace('/[^a-z0-9-_]/', '', $q['pagename']);
+ 	    $q['name'] = $q['pagename'];
+ 	    $q['static'] = true;
+             $where .= " AND post_name = '" . $q['pagename'] . "'";
          }
  
+ 
          if ('' != $q['w']) {
              $q['w'] = ''.intval($q['w']);