[wp-cvs] wordpress/wp-includes classes.php,1.55,1.56

[Ryan Boren]

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

Modified Files:
	classes.php 
Log Message:
/archives/%post_id% permalinks break for post ids over 1000.  http://mosquito.wordpress.org/view.php?id=847

Index: classes.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/classes.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** classes.php	13 Feb 2005 17:52:58 -0000	1.55
--- classes.php	13 Feb 2005 18:26:50 -0000	1.56
***************
*** 855,860 ****
  		} 
  
  		if (empty($this->date_structure)) {
! 			$this->date_structure = $this->front . '%year%/%monthnum%/%day%';
  		}
  
--- 855,866 ----
  		} 
  
+ 		// Do not allow the date tags and %post_id% to overlap in the permalink
+ 		// structure. If they do, move the date tags to $front/date/.  
+ 		$front = $this->front;
+ 		if ( false !== strpos($this->permalink_structure, $this->front . '%post_id%') )
+ 			$front = $front . 'date/';
+ 			 
  		if (empty($this->date_structure)) {
! 			$this->date_structure = $front . '%year%/%monthnum%/%day%';
  		}