Ticket #5305: 5305.2.diff

src/wp-includes/rewrite.php

@@ -895 +895 @@
          * one is used. If none matches, then the default will be used, which is
          * year, month, day.
          *
-         * Prevents post ID and date permalinks from overlapping. In the case of
-         * post_id, the date permalink will be prepended with front permalink with
-         * 'date/' before the actual permalink to form the complete date permalink
-         * structure.
+         * Prevents post ID or slug and date permalinks from overlapping. In the case of
+         * post_id or a postname only structure, the date permalink will be prepended 
+         * with front permalink and 'date/' before the actual permalink to form the 
+         * complete date permalink structure.
          *
          * @since 1.5.0
          * @access public
@@ -930 +930 @@
                 if ( empty($date_endian) )
                         $date_endian = '%year%/%monthnum%/%day%';
 
-                // 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/.
+                /*
+                 * Do not allow the date tags and %post_id% or %postname% to overlap in the 
+                 * permalink structure. If they do, move the date tags to $front/date/.
+                 */
                 $front = $this->front;
                 preg_match_all('/%.+?%/', $this->permalink_structure, $tokens);
                 $tok_index = 1;
                 foreach ( (array) $tokens[0] as $token) {
-                        if ( '%post_id%' == $token && ($tok_index <= 3) ) {
+                        if ( ( '%post_id%' == $token && $tok_index <= 3 ) || ( '%postname%' == $token && $tok_index == 1 ) ) {
                                 $front = $front . 'date/';
                                 break;
                         }