Ticket #25418: siteurl2.diff

wp-includes/class-http.php

@@ -513 +513 @@
                 if ( ! $check )
                         return true;
 
-                $home = parse_url( get_option('siteurl') );
+                $home = parse_url( site_url() );
 
                 // Don't block requests back to ourselves by default
                 if ( $check['host'] == 'localhost' || $check['host'] == $home['host'] )
@@ -1525 +1525 @@
                 if ( $check === false )
                         return true;
 
-                $home = parse_url( get_option('siteurl') );
+                $home = parse_url( site_url() );
 
                 $result = apply_filters( 'pre_http_send_through_proxy', null, $uri, $check, $home );
                 if ( ! is_null( $result ) )

wp-includes/default-constants.php

@@ -91 +91 @@
  */
 function wp_plugin_directory_constants() {
         if ( !defined('WP_CONTENT_URL') )
-                define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
+                define( 'WP_CONTENT_URL', site_url( '/wp-content' ) ); // full url - WP_CONTENT_DIR is defined further up
 
         /**
          * Allows for the plugins directory to be moved from the default location.
@@ -209 +209 @@
          * @since 1.5.0
          */
         if ( !defined('SITECOOKIEPATH') )
-                define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+                define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', site_url('/') ) );
 
         /**
          * @since 2.6.0

wp-includes/theme.php

@@ -498 +498 @@
                 $theme_root_uri = content_url( 'themes' );
         }
 
-        return apply_filters( 'theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template );
+        return apply_filters( 'theme_root_uri', $theme_root_uri, site_url(), $stylesheet_or_template );
 }
 
 /**

wp-includes/comment-template.php

@@ -858 +858 @@
         if ( '' != get_option('permalink_structure') )
                 $tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
         else
-                $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+                $tb_url = site_url( '/wp-trackback.php?p=' . get_the_ID() );
 
         /**
          * Filter the returned trackback URL.
@@ -1171 +1171 @@
                 if ( empty( $wpcommentspopupfile ) )
                         $home = home_url();
                 else
-                        $home = get_option('siteurl');
+                        $home = site_url();
                 echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
                 echo '" onclick="wpopen(this.href); return false"';
         } else { // if comments_popup_script() is not in the template, display simple comment link

wp-includes/bookmark-template.php

@@ -103 +103 @@
                         if ( strpos($bookmark->link_image, 'http') === 0 )
                                 $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
                         else // If it's a relative path
-                                $output .= "<img src=\"" . get_option('siteurl') . "$bookmark->link_image\" $alt $title />";
+                                $output .= "<img src=\"" . site_url( $bookmark->link_image ) . "\" $alt $title />";
 
                         if ( $show_name )
                                 $output .= " $name";

wp-includes/user.php

@@ -719 +719 @@
                 $blogs[ $blog_id ]->domain = '';
                 $blogs[ $blog_id ]->path = '';
                 $blogs[ $blog_id ]->site_id = 1;
-                $blogs[ $blog_id ]->siteurl = get_option('siteurl');
+                $blogs[ $blog_id ]->siteurl = site_url();
                 $blogs[ $blog_id ]->archived = 0;
                 $blogs[ $blog_id ]->spam = 0;
                 $blogs[ $blog_id ]->deleted = 0;

wp-includes/general-template.php

@@ -478 +478 @@
                         $output = get_feed_link('comments_rss2');
                         break;
                 case 'pingback_url':
-                        $output = get_option('siteurl') .'/xmlrpc.php';
+                        $output = site_url() .'/xmlrpc.php';
                         break;
                 case 'stylesheet_url':
                         $output = get_stylesheet_uri();

wp-includes/theme-compat/comments-popup.php

@@ -66 +66 @@
 <h2><?php _e('Leave a comment'); ?></h2>
 <p><?php printf(__('Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
 
-<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
 <?php if ( $user_ID ) : ?>
         <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out &raquo;</a>'), get_edit_user_link(), $user_identity, wp_logout_url(get_permalink())); ?></p>
 <?php else : ?>