Changeset 1388

Timestamp:

06/06/2004 02:02:27 AM (22 years ago)

Author:

rboren

Message:

Rewrite and %category% fixes.

Location:

trunk/wp-includes

Files:

• functions.php (modified) (2 diffs)
• template-functions-links.php (modified) (4 diffs)

trunk/wp-includes/functions.php

@@ -1239 +1239 @@
              }
 
-    $structure = str_replace($front, '', $permalink_structure);
+    $structure = $permalink_structure;
+    if ($front != '/') {
+        $structure = str_replace($front, '', $structure);
+    }
     $structure = trim($structure, '/');
     $dirs = explode('/', $structure);
@@ -1313 +1316 @@
     // separate archive rule.
     $doarchive = false;
-    if (! (strstr($permalink_structure, '%year') && strstr($permalink_structure, '%monthnum') && strstr($permalink_structure, '%day')) ) {
+    if (! (strstr($permalink_structure, '%year%') && strstr($permalink_structure, '%monthnum%') && strstr($permalink_structure, '%day%')) ||
+        preg_match('/%category%.*(%year%|%monthnum%|%day%)/', $permalink_structure)) {
         $doarchive = true;
         $archive_structure = $front . '%year%/%monthnum%/%day%/';

trunk/wp-includes/template-functions-links.php

@@ -81 +81 @@
         // If the permalink structure does not contain year and month, make
         // one that does.
-        if (! (strstr($permalink, '%year') && strstr($permalink, '%monthnum')) ) {
+        if (! (strstr($permalink, '%year%') && strstr($permalink, '%monthnum%'))
+            || preg_match('/%category%.*(%year%|%monthnum%|%day%)/', $permalink)) {
             $front = substr($permalink, 0, strpos($permalink, '%'));
             $permalink = $front . '%year%/%monthnum%/';
@@ -93 +94 @@
         $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
         $monthlink = str_replace('%post_id%', '', $monthlink);
+        $monthlink = str_replace('%category%', '', $monthlink);
         return get_settings('home') . $monthlink;
     } else {
@@ -109 +111 @@
         // If the permalink structure does not contain year, month, and day,
         // make one that does.
-        if (! (strstr($permalink, '%year') && strstr($permalink, '%monthnum')) ) {
+        if (! (strstr($permalink, '%year%') && strstr($permalink, '%monthnum%')&& strstr($permalink, '%day%'))
+            || preg_match('/%category%.*(%year%|%monthnum%|%day%)/', $permalink)) {
             $front = substr($permalink, 0, strpos($permalink, '%'));
             $permalink = $front . '%year%/%monthnum%/%day%/';
@@ -122 +125 @@
         $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
         $daylink = str_replace('%post_id%', '', $daylink);
+        $daylink = str_replace('%category%', '', $daylink);
         return get_settings('home') . $daylink;
     } else {