Ticket #22330: 22330.diff

wp-admin/includes/class-wp-comments-list-table.php

@@ -447 +447 @@
                 $author_url = get_comment_author_url();
                 if ( 'http://' == $author_url )
                         $author_url = '';
-                $author_url_display = preg_replace( '|http://(www\.)?|i', '', $author_url );
+                $author_url_display = preg_replace( '|^http://(www\.)?|i', '', $author_url );
                 if ( strlen( $author_url_display ) > 50 )
                         $author_url_display = substr( $author_url_display, 0, 49 ) . '...';
 

wp-admin/network.php

@@ -51 +51 @@
  * @return bool Whether subdomain install is allowed
  */
 function allow_subdomain_install() {
-        $domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'siteurl' ) );
+        $domain = preg_replace( '|^https?://([^/]+)|', '$1', get_option( 'siteurl' ) );
         if( false !== strpos( $domain, '/' ) || 'localhost' == $domain || preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $domain ) )
                 return false;
 
@@ -86 +86 @@
 function get_clean_basedomain() {
         if ( $existing_domain = network_domain_check() )
                 return $existing_domain;
-        $domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
+        $domain = preg_replace( '|^https?://|', '', get_option( 'siteurl' ) );
         if ( $slash = strpos( $domain, '/' ) )
                 $domain = substr( $domain, 0, $slash );
         return $domain;

wp-includes/class-wp-xmlrpc-server.php

@@ -3407 +3407 @@
 
                 /* warning: here we make the assumption that the blog's URL is on the same server */
                 $filename = get_option('home') . '/';
-                $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
+                $filename = preg_replace('#^https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
 
                 $f = fopen($filename, 'r');
                 $content = fread($f, filesize($filename));
@@ -3447 +3447 @@
 
                 /* warning: here we make the assumption that the blog's URL is on the same server */
                 $filename = get_option('home') . '/';
-                $filename = preg_replace('#https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
+                $filename = preg_replace('#^https?://.+?/#', $_SERVER['DOCUMENT_ROOT'].'/', $filename);
 
                 if ($f = fopen($filename, 'w+')) {
                         fwrite($f, $content);

wp-includes/default-constants.php

@@ -192 +192 @@
          * @since 1.2.0
          */
         if ( !defined('COOKIEPATH') )
-                define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
+                define('COOKIEPATH', preg_replace('|^https?://[^/]+|i', '', get_option('home') . '/' ) );
 
         /**
          * @since 1.5.0
          */
         if ( !defined('SITECOOKIEPATH') )
-                define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+                define('SITECOOKIEPATH', preg_replace('|^https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
 
         /**
          * @since 2.6.0
@@ -210 +210 @@
          * @since 2.6.0
          */
         if ( !defined('PLUGINS_COOKIE_PATH') )
-                define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL)  );
+                define( 'PLUGINS_COOKIE_PATH', preg_replace('|^https?://[^/]+|i', '', WP_PLUGIN_URL) );
 
         /**
          * @since 2.0.0

wp-includes/formatting.php

@@ -2704 +2704 @@
  * @return string Absolute path.
  */
 function wp_make_link_relative( $link ) {
-        return preg_replace( '|https?://[^/]+(/.*)|i', '$1', $link );
+        return preg_replace( '|^https?://[^/]+(/.*)|i', '$1', $link );
 }
 
 /**