WordPress.org

Make WordPress Core

Changeset 24993


Ignore:
Timestamp:
08/06/2013 04:07:46 PM (5 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/network/settings.php

    r23556 r24993  
    2626            '<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>' .
    2727            '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' .
    28             '<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>' .
    2928            '<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>' .
    3029            '<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

    r23438 r24993  
    1313 * Deprecated functions come here to die.
    1414 */
     15
     16/**
     17 * Get the "dashboard blog", the blog where users without a blog edit their profile data.
     18 * Dashboard blog functionality was removed in WordPress 3.1, replaced by the user admin.
     19 *
     20 * @since MU
     21 * @deprecated 3.1.0
     22 * @see get_blog_details()
     23 * @return int
     24 */
     25function get_dashboard_blog() {
     26    _deprecated_function( __FUNCTION__, '3.1' );
     27    if ( $blog = get_site_option( 'dashboard_blog' ) )
     28        return get_blog_details( $blog );
     29
     30    return get_blog_details( $GLOBALS['current_site']->blog_id );
     31}
    1532
    1633/**
  • trunk/wp-includes/ms-functions.php

    r24848 r24993  
    17391739
    17401740/**
    1741  * Get the "dashboard blog", the blog where users without a blog edit their profile data.
    1742  *
    1743  * @since MU
    1744  * @uses get_blog_details()
    1745  *
    1746  * @return int
    1747  */
    1748 function get_dashboard_blog() {
    1749     if ( $blog = get_site_option( 'dashboard_blog' ) )
    1750         return get_blog_details( $blog );
    1751 
    1752     return get_blog_details( $GLOBALS['current_site']->blog_id );
    1753 }
    1754 
    1755 /**
    17561741 * Check whether a usermeta key has to do with the current blog.
    17571742 *
Note: See TracChangeset for help on using the changeset viewer.