Ticket #25235: 25235.diff

src/wp-includes/ms-blogs.php

@@ -56 +56 @@
 }
 
 /**
- * Get a full blog URL, given a domain and a path.
- *
- * @since MU
- *
- * @param string $domain
- * @param string $path
- * @return string
- */
-function get_blogaddress_by_domain( $domain, $path ) {
-        if ( is_subdomain_install() ) {
-                $url = "http://" . $domain.$path;
-        } else {
-                if ( $domain != $_SERVER['HTTP_HOST'] ) {
-                        $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
-                        $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
-                        // we're not installing the main blog
-                        if ( $blogname != 'www.' )
-                                $url .= $blogname . '/';
-                } else { // main blog
-                        $url = 'http://' . $domain . $path;
-                }
-        }
-        return esc_url_raw( $url );
-}
-
-/**
  * Given a blog's (subdomain or directory) slug, retrieve its id.
  *
  * @since MU

src/wp-includes/deprecated.php

@@ -3378 +3378 @@
 
         return $size . $unit;
 }
+
+/**
+ * Get a full blog URL, given a domain and a path.
+ *
+ * @since MU
+ * @deprecated 3.7.0
+ *
+ * @param string $domain
+ * @param string $path
+ * @return string
+ */
+function get_blogaddress_by_domain( $domain, $path ) {
+        _deprecated_function( __FUNCTION__, '3.7' );
+
+        if ( is_subdomain_install() ) {
+                $url = "http://" . $domain.$path;
+        } else {
+                if ( $domain != $_SERVER['HTTP_HOST'] ) {
+                        $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
+                        $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
+                        // we're not installing the main blog
+                        if ( $blogname != 'www.' )
+                                $url .= $blogname . '/';
+                } else { // main blog
+                        $url = 'http://' . $domain . $path;
+                }
+        }
+        return esc_url_raw( $url );
+}