Ticket #30233: 30233.diff

wp-includes/ms-deprecated.php

@@ -346 +346 @@
                 }
         }
         return esc_url_raw( $url );
+}
+
+/**
+ * Check whether a blogname is already taken.
+ *
+ * Used during the new site registration process to ensure
+ * that each blogname is unique.
+ *
+ * @since MU
+ * @deprecated 4.2
+ * @deprecated Use wp_get_site()
+ *
+ * @param string $domain The domain to be checked.
+ * @param string $path The path to be checked.
+ * @param int $site_id Optional. Relevant only on multi-network installs.
+ * @return int
+ */
+function domain_exists($domain, $path, $site_id = 1) {
+        _deprecated_function( __FUNCTION__, '3.7', 'wp_get_site()' );
+
+        return wp_get_site( $domain, $path, $site_id );
 }
+ No newline at end of file

wp-includes/ms-functions.php

@@ -305 +305 @@
                 $path = '/';
 
         // Check if the domain has been used already. We should return an error message.
-        if ( domain_exists($domain, $path, $site_id) )
+        if ( wp_get_site($domain, $path, $site_id) )
                 return __( '<strong>ERROR</strong>: Site URL already taken.' );
 
         // Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
@@ -658 +658 @@
                 $mydomain = "$domain";
                 $path = $base.$blogname.'/';
         }
-        if ( domain_exists($mydomain, $path, $current_site->id) )
+        if ( wp_get_site($mydomain, $path, $current_site->id) )
                 $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
 
         if ( username_exists( $blogname ) ) {
@@ -1126 +1126 @@
                 $path = '/';
 
         // Check if the domain has been used already. We should return an error message.
-        if ( domain_exists($domain, $path, $site_id) )
+        if ( wp_get_site($domain, $path, $site_id) )
                 return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
 
         if ( !defined('WP_INSTALLING') )
@@ -1265 +1265 @@
  * Used during the new site registration process to ensure
  * that each blogname is unique.
  *
- * @since MU
+ * @since 4.2
  *
  * @param string $domain The domain to be checked.
  * @param string $path The path to be checked.
- * @param int $site_id Optional. Relevant only on multi-network installs.
+ * @param int|array|null $site_ids Optional. Site ID(s) to search or NULL to search all. Relevant only on multi-network installs.
  * @return int
  */
-function domain_exists($domain, $path, $site_id = 1) {
+function wp_get_site( $domain, $path, $site_ids = null ) {
+
         global $wpdb;
         $path = trailingslashit( $path );
-        $result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+        $sql = "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s";
+        if ( is_array( $site_ids ) ) {
+                $sql .= ' AND site_id IN (%s)';
+        } elseif ( ! empty( $site_ids ) ) {
+                $sql .= ' AND site_id = %d';
+        }
+        $result = $wpdb->get_var( $wpdb->prepare( $sql, $domain, $path, $site_ids ) );
 
         /**
          * Filter whether a blogname is taken.
@@ -1287 +1294 @@
          * @param string   $path    Path to be checked.
          * @param int      $site_id Site ID. Relevant only on multi-network installs.
          */
-        return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
+        return apply_filters( 'domain_exists', $result, $domain, $path, $site_ids );
 }
 
 /**