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

Timestamp:

01/04/2010 05:23:29 PM (15 years ago)

Author:

ryan

Message:

Introduce home_url(). Props Denis-de-Bernardy, hakre. see #9008

File:

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

trunk/wp-includes/link-template.php

@@ -151 +151 @@
             $post->post_name,
         );
-        $permalink = get_option('home') . str_replace($rewritecode, $rewritereplace, $permalink);
+        $permalink = home_url( str_replace($rewritecode, $rewritereplace, $permalink) );
         $permalink = user_trailingslashit($permalink, 'single');
         return apply_filters('post_link', $permalink, $post, $leavename);
     } else { // if they're not using the fancy permalink option
-        $permalink = trailingslashit(get_option('home')) . '?p=' . $post->ID;
+        $permalink = home_url('?p=' . $post->ID);
         return apply_filters('post_link', $permalink, $post, $leavename);
     }
@@ -196 +196 @@
 
     if ( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') )
-        $link = get_option('home');
+        $link = home_url();
     else
         $link = _get_page_link( $id , $leavename, $sample );
@@ -229 +229 @@
         $link = get_page_uri($id);
         $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);
-        $link = trailingslashit(get_option('home')) . $link;
+        $link = home_url($link);
         $link = user_trailingslashit($link, 'page');
     } else {
-        $link = trailingslashit(get_option('home')) . "?page_id=$id";
+        $link = home_url("?page_id=$id");
     }
 
@@ -294 +294 @@
     if ( !empty($yearlink) ) {
         $yearlink = str_replace('%year%', $year, $yearlink);
-        return apply_filters('year_link', get_option('home') . user_trailingslashit($yearlink, 'year'), $year);
+        return apply_filters('year_link', home_url( user_trailingslashit($yearlink, 'year') ), $year);
     } else {
-        return apply_filters('year_link', trailingslashit(get_option('home')) . '?m=' . $year, $year);
+        return apply_filters('year_link', home_url('?m=' . $year), $year);
     }
 }
@@ -319 +319 @@
         $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, 'month'), $year, $month);
+        return apply_filters('month_link', home_url( user_trailingslashit($monthlink, 'month') ), $year, $month);
     } else {
-        return apply_filters('month_link', trailingslashit(get_option('home')) . '?m=' . $year . zeroise($month, 2), $year, $month);
+        return apply_filters('month_link', home_url( '?m=' . $year . zeroise($month, 2) ), $year, $month);
     }
 }
@@ -349 +349 @@
         $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, 'day'), $year, $month, $day);
+        return apply_filters('day_link', home_url( user_trailingslashit($daylink, 'day') ), $year, $month, $day);
     } else {
-        return apply_filters('day_link', trailingslashit(get_option('home')) . '?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
+        return apply_filters('day_link', home_url( '?m=' . $year . zeroise($month, 2) . zeroise($day, 2) ), $year, $month, $day);
     }
 }
@@ -378 +378 @@
         $permalink = str_replace('%feed%', $feed, $permalink);
         $permalink = preg_replace('#/+#', '/', "/$permalink");
-        $output =  get_option('home') . user_trailingslashit($permalink, 'feed');
+        $output =  home_url( user_trailingslashit($permalink, 'feed') );
     } else {
         if ( empty($feed) )
@@ -386 +386 @@
             $feed = str_replace('comments_', 'comments-', $feed);
 
-        $output = trailingslashit(get_option('home')) . "?feed={$feed}";
+        $output = home_url("?feed={$feed}");
     }
 
@@ -418 +418 @@
         $type = get_post_field('post_type', $post_id);
         if ( 'page' == $type )
-            $url = trailingslashit(get_option('home')) . "?feed=$feed&page_id=$post_id";
+            $url = home_url("?feed=$feed&page_id=$post_id");
         else
-            $url = trailingslashit(get_option('home')) . "?feed=$feed&p=$post_id";
+            $url = home_url("?feed=$feed&p=$post_id");
     }
 
@@ -472 +472 @@
 
     if ( '' == $permalink_structure ) {
-        $link = trailingslashit(get_option('home')) . "?feed=$feed&author=" . $author_id;
+        $link = home_url("?feed=$feed&author=" . $author_id);
     } else {
         $link = get_author_posts_url($author_id);
@@ -516 +516 @@
 
     if ( '' == $permalink_structure ) {
-        $link = trailingslashit(get_option('home')) . "?feed=$feed&cat=" . $cat_id;
+        $link = home_url("?feed=$feed&cat=" . $cat_id);
     } else {
         $link = get_category_link($cat_id);
@@ -555 +555 @@
 
     if ( '' == $permalink_structure ) {
-        $link = trailingslashit(get_option('home')) . "?feed=$feed&tag=" . $tag->slug;
+        $link = home_url("?feed=$feed&tag=" . $tag->slug);
     } else {
         $link = get_tag_link($tag->term_id);
@@ -630 +630 @@
         $feed = get_default_feed();
 
-    $link = trailingslashit(get_option('home')) . "?s=$search&feed=$feed";
+    $link = home_url("?s=$search&feed=$feed");
 
     $link = apply_filters('search_feed_link', $link);
@@ -655 +655 @@
         $feed = get_default_feed();
 
-    $link = trailingslashit(get_option('home')) . "?s=$search&feed=comments-$feed";
+    $link = home_url("?s=$search&feed=comments-$feed");
 
     $link = apply_filters('search_feed_link', $link);
@@ -1276 +1276 @@
     $request = remove_query_arg( 'paged' );
 
-    $home_root = parse_url(get_option('home'));
+    $home_root = parse_url(home_url());
     $home_root = ( isset($home_root['path']) ) ? $home_root['path'] : '';
     $home_root = preg_quote( trailingslashit( $home_root ), '|' );
@@ -1707 +1707 @@
 
     return apply_filters('shortcut_link', $link);
+}
+
+/**
+ * Retrieve the home url.
+ *
+ * Returns the 'home' option with the appropriate protocol,  'https' if
+ * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
+ * overridden.
+ *
+ * @package WordPress
+ * @since 3.0
+ *
+ * @param  string $path   (optional) Path relative to the home url.
+ * @param  string $scheme (optional) Scheme to give the home url context. Currently 'http','https'
+ * @return string Home url link with optional path appended.
+*/
+function home_url( $path = '', $scheme = null ) {
+    $orig_scheme = $scheme;
+    $scheme      = is_ssl() && !is_admin() ? 'https' : 'http';
+    $url = str_replace( 'http://', "$scheme://", get_option('home') );
+
+    if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
+        $url .= '/' . ltrim( $path, '/' );
+
+    return apply_filters( 'home_url', $url, $path, $orig_scheme );
 }