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

Timestamp:

02/15/2007 07:07:12 AM (18 years ago)

Author:

markjaquith

Message:

Consistent use or disuse of trailing slashes in URLs according to user preference. props MathiasBynens. fixes #1485

File:

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

trunk/wp-includes/link-template.php

@@ -9 +9 @@
 function permalink_link() { // For backwards compatibility
     echo apply_filters('the_permalink', get_permalink());
+}
+
+
+/**
+ * Conditionally adds a trailing slash if the permalink structure
+ * has a trailing slash, strips the trailing slash if not
+ * @global object Uses $wp_rewrite
+ * @param $string string a URL with or without a trailing slash
+ * @return string
+ */
+function user_trailingslashit($string) {
+    global $wp_rewrite;
+    if ( $wp_rewrite->use_trailing_slashes )
+        $string = trailingslashit($string);
+    else
+        $string = preg_replace('|/$|', '', $string); // untrailing slash
+    return $string;
 }
 
@@ -117 +134 @@
         $link = get_page_uri($id);
         $link = str_replace('%pagename%', $link, $pagestruct);
-        $link = get_option('home') . "/$link/";
+        $link = get_option('home') . "/$link";
+        $link = user_trailingslashit($link);
     } else {
         $link = get_option('home') . "/?page_id=$id";
@@ -159 +177 @@
     if ( !empty($yearlink) ) {
         $yearlink = str_replace('%year%', $year, $yearlink);
-        return apply_filters('year_link', get_option('home') . trailingslashit($yearlink), $year);
+        return apply_filters('year_link', get_option('home') . user_trailingslashit($yearlink), $year);
     } else {
         return apply_filters('year_link', get_option('home') . '/?m=' . $year, $year);
@@ -175 +193 @@
         $monthlink = str_replace('%year%', $year, $monthlink);
         $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-        return apply_filters('month_link', get_option('home') . trailingslashit($monthlink), $year, $month);
+        return apply_filters('month_link', get_option('home') . user_trailingslashit($monthlink), $year, $month);
     } else {
         return apply_filters('month_link', get_option('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
@@ -195 +213 @@
         $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') . trailingslashit($daylink), $year, $month, $day);
+        return apply_filters('day_link', get_option('home') . user_trailingslashit($daylink), $year, $month, $day);
     } else {
         return apply_filters('day_link', get_option('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
@@ -218 +236 @@
 
         $permalink = str_replace('%feed%', $feed, $permalink);
-        $permalink = preg_replace('#/+#', '/', "/$permalink/");
-        $output =  get_option('home') . $permalink;
+        $permalink = preg_replace('#/+#', '/', "/$permalink");
+        $output =  get_option('home') . user_trailingslashit($permalink);
     } else {
         if ( false !== strpos($feed, 'comments_') )
@@ -436 +454 @@
     $qstr = preg_replace('|^/+|', '', $qstr);
     if ( $permalink )
-        $qstr = trailingslashit($qstr);
+        $qstr = user_trailingslashit($qstr);
     $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('page/1/', '', $qstr); // for mod_rewrite style
+        $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 = remove_query_arg('paged', $qstr); // for query style
     }