Changeset 24993

Timestamp:

08/06/2013 04:07:46 PM (12 years ago)

Author:

ryan

Message:

Deprecate get_dashboard_blog().
Remove contextual help for Dashboard Site from the network settings screen.

Props sillybean, ocean90
fixes #24838

Location:

trunk

Files:

• wp-admin/network/settings.php (modified) (1 diff)
• wp-includes/ms-deprecated.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)

trunk/wp-admin/network/settings.php

@@ -26 +26 @@
             '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
             '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
-            '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
             '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' .
             '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' .

trunk/wp-includes/ms-deprecated.php

@@ -13 +13 @@
  * Deprecated functions come here to die.
  */
+
+/**
+ * Get the "dashboard blog", the blog where users without a blog edit their profile data.
+ * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin.
+ *
+ * @since MU
+ * @deprecated 3.1.0
+ * @see get_blog_details()
+ * @return int
+ */
+function get_dashboard_blog() {
+    _deprecated_function( __FUNCTION__, '3.1' );
+    if ( $blog = get_site_option( 'dashboard_blog' ) )
+        return get_blog_details( $blog );
+
+    return get_blog_details( $GLOBALS['current_site']->blog_id );
+}
 
 /**

trunk/wp-includes/ms-functions.php

@@ -1739 +1739 @@
 
 /**
- * Get the "dashboard blog", the blog where users without a blog edit their profile data.
- *
- * @since MU
- * @uses get_blog_details()
- *
- * @return int
- */
-function get_dashboard_blog() {
-    if ( $blog = get_site_option( 'dashboard_blog' ) )
-        return get_blog_details( $blog );
-
-    return get_blog_details( $GLOBALS['current_site']->blog_id );
-}
-
-/**
  * Check whether a usermeta key has to do with the current blog.
  *