Changeset 7531

Timestamp:

03/26/08 20:17:31 (7 months ago)

Author:

ryan

Message:

Fix attachment links for permalink structures containing category tag. Props andy. fixes #4699

Files:

• trunk/wp-includes/link-template.php (modified) (1 diff)
• trunk/wp-includes/query.php (modified) (1 diff)
• trunk/wp-includes/rewrite.php (modified) (1 diff)

trunk/wp-includes/link-template.php

@@ -180 +180 @@
-        else
-            $parentlink = get_permalink( $object->post_parent );
-
+|| false !== strpos(get_option('permalink_structure'), '%category%') 
-            $name = 'attachment/' . $object->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
-        else

trunk/wp-includes/query.php

@@ -1037 +1037 @@
-
-        // Category stuff for nice URLs
-
+&& !$this->is_singular 
-            $reqcat = get_category_by_path($q['category_name']);
-            $q['category_name'] = str_replace('%2F', '/', urlencode(urldecode($q['category_name'])));

trunk/wp-includes/rewrite.php

@@ -766 +766 @@
-                    if ( ! $page ) //require <permalink>/attachment/stuff form for pages because of confusion with subpages
-                        $rewrite = array_merge($rewrite, array($sub1 => $subquery, $sub1tb => $subtbquery, $sub1feed => $subfeedquery, $sub1feed2 => $subfeedquery));
-$rewrite, array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery)
+array($sub2 => $subquery, $sub2tb => $subtbquery, $sub2feed => $subfeedquery, $sub2feed2 => $subfeedquery), $rewrite
-                }
-            } //if($num_toks)