Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Deprecate get_dashboard_blog(). 

Remove contextual help for Dashboard Site from the network settings screen.

Props sillybean, ocean90
fixes #24838


git-svn-id: http://core.svn.wordpress.org/trunk@24993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2013-08-06 16:07:46 +00:00
parent dd7a9120df
commit 0e923a5c9d
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/network/settings.php
View File

@ -25,7 +25,6 @@ get_current_screen()->add_help_tab( array(
'content' =>
'<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>' .
'<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' .

17
wp-includes/ms-deprecated.php
View File

@ -13,6 +13,23 @@
* 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 );
}
/**
* @since MU
* @deprecated 3.0.0

15
wp-includes/ms-functions.php
View File

@ -1737,21 +1737,6 @@ function update_blog_public( $old_value, $value ) {
}
add_action('update_option_blog_public', 'update_blog_public', 10, 2);
/**
* 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.
*