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

minor fixes to populate_options(), UI tweaks, see #11644 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12920 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
wpmuguru 2010-02-01 20:01:14 +00:00
parent c26805d326
commit cfbffea85e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/includes/ms.php
View File

@ -767,7 +767,8 @@ function choose_primary_blog() {
?>
<table class="form-table">
<tr>
<th scope="row"><?php _e('Primary Blog'); ?></th>
<?php /* translators: My sites label */ ?>
<th scope="row"><?php _e('Primary Site'); ?></th>
<td>
<?php
$all_blogs = get_blogs_of_user( $current_user->ID );

6
wp-admin/includes/schema.php
View File

@ -180,7 +180,7 @@ CREATE TABLE $wpdb->usermeta (
* @uses $wp_db_version
*/
function populate_options() {
global $wpdb, $wp_db_version;
global $wpdb, $wp_db_version, $current_site;
$guessurl = wp_guess_url();
@ -196,7 +196,8 @@ function populate_options() {
$options = array(
'siteurl' => $guessurl,
'blogname' => __('My Blog'),
'blogdescription' => __('Just another WordPress weblog'),
/* translators: blog tagline */
'blogdescription' => __('Just another WordPress site'),
'users_can_register' => 0,
'admin_email' => 'you@example.com',
'start_of_week' => 1,
@ -319,6 +320,7 @@ function populate_options() {
// 3.0 multisite
if ( is_multisite() ) {
/* translators: blog tagline */
$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), $current_site->site_name );
$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
}

6
wp-admin/menu.php
View File

@ -33,9 +33,11 @@ if ( is_multisite() ) {
if ( is_multisite() && is_super_admin() ) {
$menu[1] = array( '', 'read', 'separator0', '', 'wp-menu-separator' );
$menu[2] = array(__('Site Admin'), '10', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
/* translators: Network menu item */
$menu[2] = array(__('Network'), '10', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
$submenu[ 'ms-admin.php' ][1] = array( __('Admin'), 'super_admin', 'ms-admin.php' );
$submenu[ 'ms-admin.php' ][5] = array( __('Blogs'), 'super_admin', 'ms-sites.php' );
/* translators: Sites menu item */
$submenu[ 'ms-admin.php' ][5] = array( __('Sites'), 'super_admin', 'ms-sites.php' );
$submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'super_admin', 'ms-users.php' );
$submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'super_admin', 'ms-themes.php' );
$submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'super_admin', 'ms-options.php' );