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

They call me multisite. props ryan, zeo. see #19020. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2011-12-01 00:36:19 +00:00
parent 02dfdbbbf4
commit cc50764a8b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/admin.php
View File

@ -58,7 +58,7 @@ require_once(ABSPATH . 'wp-admin/includes/update.php');
/** WordPress Deprecated Administration API */ /** WordPress Deprecated Administration API */
require_once(ABSPATH . 'wp-admin/includes/deprecated.php'); require_once(ABSPATH . 'wp-admin/includes/deprecated.php');
/** WordPress Multi-Site support API */ /** WordPress Multisite support API */
if ( is_multisite() ) { if ( is_multisite() ) {
require_once(ABSPATH . 'wp-admin/includes/ms.php'); require_once(ABSPATH . 'wp-admin/includes/ms.php');
require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php'); require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php');

2
wp-admin/my-sites.php
View File

@ -37,7 +37,7 @@ $parent_file = 'index.php';
add_contextual_help($current_screen, add_contextual_help($current_screen,
'<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' . '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
'<p>' . __('Up until WordPress version 3.0, what is now called a Multi-site Network had to be installed separately as WordPress MU (multi-user).') . '</p>' '<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</p>'
); );
get_current_screen()->set_help_sidebar( get_current_screen()->set_help_sidebar(

2
wp-admin/themes.php
View File

@ -48,7 +48,7 @@ get_current_screen()->add_help_tab( array(
if ( current_user_can( 'install_themes' ) ) { if ( current_user_can( 'install_themes' ) ) {
if ( is_multisite() ) { if ( is_multisite() ) {
$help_install = '<p>' . __('Installing themes on MultiSite can only be done from the Network Admin section.') . '</p>'; $help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
} else { } else {
$help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/' ) . '</p>'; $help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/' ) . '</p>';
} }

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

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Multi-site WordPress API * Multisite WordPress API
* *
* @package WordPress * @package WordPress
* @subpackage Multisite * @subpackage Multisite