Changeset 5019 for trunk/wp-includes/link-template.php

Timestamp:

03/10/2007 06:18:43 AM (18 years ago)

Author:

markjaquith

Message:

user_trailingslashit filter for users who sometimes want trailing slashes only on certain URL types. fixes #3899

File:

• trunk/wp-includes/link-template.php (modified) (9 diffs)

trunk/wp-includes/link-template.php

@@ -17 +17 @@
  * @global object Uses $wp_rewrite
  * @param $string string a URL with or without a trailing slash
+ * @param $type_of_url string the type of URL being considered (e.g. single, category, etc) for use in the filter
  * @return string
  */
-function user_trailingslashit($string) {
+function user_trailingslashit($string, $type_of_url = '') {
     global $wp_rewrite;
     if ( $wp_rewrite->use_trailing_slashes )
         $string = trailingslashit($string);
     else
-        $string = preg_replace('|/$|', '', $string); // untrailing slash
+        $string = preg_replace('|/+$|', '', $string); // untrailing slash
+
+    // Note that $type_of_url can be one of following:
+    // single, single_trackback, single_feed, single_paged, feed, category, page, year, month, day, paged
+    $string = apply_filters('user_trailingslashit', $string, $type_of_url);
     return $string;
 }
@@ -95 +100 @@
             $post->post_name,
         );
-        return apply_filters('post_link', get_option('home') . str_replace($rewritecode, $rewritereplace, $permalink), $post);
+        $permalink = get_option('home') . str_replace($rewritecode, $rewritereplace, $permalink);
+        $permalink = user_trailingslashit($permalink, 'single');
+        return apply_filters('post_link', $permalink, $post);
     } else { // if they're not using the fancy permalink option
         $permalink = get_option('home') . '/?p=' . $post->ID;
@@ -135 +142 @@
         $link = str_replace('%pagename%', $link, $pagestruct);
         $link = get_option('home') . "/$link";
-        $link = user_trailingslashit($link);
+        $link = user_trailingslashit($link, 'page');
     } else {
         $link = get_option('home') . "/?page_id=$id";
@@ -177 +184 @@
     if ( !empty($yearlink) ) {
         $yearlink = str_replace('%year%', $year, $yearlink);
-        return apply_filters('year_link', get_option('home') . user_trailingslashit($yearlink), $year);
+        return apply_filters('year_link', get_option('home') . user_trailingslashit($yearlink, 'year'), $year);
     } else {
         return apply_filters('year_link', get_option('home') . '/?m=' . $year, $year);
@@ -193 +200 @@
         $monthlink = str_replace('%year%', $year, $monthlink);
         $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-        return apply_filters('month_link', get_option('home') . user_trailingslashit($monthlink), $year, $month);
+        return apply_filters('month_link', get_option('home') . user_trailingslashit($monthlink, 'month'), $year, $month);
     } else {
         return apply_filters('month_link', get_option('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
@@ -213 +220 @@
         $daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
         $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
-        return apply_filters('day_link', get_option('home') . user_trailingslashit($daylink), $year, $month, $day);
+        return apply_filters('day_link', get_option('home') . user_trailingslashit($daylink, 'day'), $year, $month, $day);
     } else {
         return apply_filters('day_link', get_option('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
@@ -237 +244 @@
         $permalink = str_replace('%feed%', $feed, $permalink);
         $permalink = preg_replace('#/+#', '/', "/$permalink");
-        $output =  get_option('home') . user_trailingslashit($permalink);
+        $output =  get_option('home') . user_trailingslashit($permalink, 'feed');
     } else {
         if ( false !== strpos($feed, 'comments_') )
@@ -258 +265 @@
         if ( 'rss2' != $feed )
             $url .= "/$feed";
-        $url = user_trailingslashit($url);
+        $url = user_trailingslashit($url, 'single_feed');
     } else {
         $url = get_option('home') . "/?feed=$feed&p=$id";
@@ -472 +479 @@
     $qstr = preg_replace('|^/+|', '', $qstr);
     if ( $permalink )
-        $qstr = user_trailingslashit($qstr);
+        $qstr = user_trailingslashit($qstr, 'paged');
     $qstr = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_option('home') ) . $qstr );
 
     // showing /page/1/ or ?paged=1 is redundant
     if ( 1 === $pagenum ) {
-        $qstr = str_replace(user_trailingslashit('index.php/page/1'), '', $qstr); // for PATHINFO style
-        $qstr = str_replace(user_trailingslashit('page/1'), '', $qstr); // for mod_rewrite style
+        $qstr = str_replace(user_trailingslashit('index.php/page/1', 'paged'), '', $qstr); // for PATHINFO style
+        $qstr = str_replace(user_trailingslashit('page/1', 'paged'), '', $qstr); // for mod_rewrite style
         $qstr = remove_query_arg('paged', $qstr); // for query style
     }