<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12920] trunk/wp-admin: minor fixes to populate_options(), UI tweaks,
see #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12920">12920</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-01 20:01:14 +0000 (Mon, 01 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>minor fixes to populate_options(), UI tweaks, see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (12919 => 12920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-02-01 18:01:23 UTC (rev 12919)
+++ trunk/wp-admin/includes/ms.php 2010-02-01 20:01:14 UTC (rev 12920)
</span><span class="lines">@@ -767,7 +767,8 @@
</span><span class="cx"> ?>
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><del>- <th scope="row"><?php _e('Primary Blog'); ?></th>
</del><ins>+ <?php /* translators: My sites label */ ?>
+ <th scope="row"><?php _e('Primary Site'); ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <?php
</span><span class="cx"> $all_blogs = get_blogs_of_user( $current_user->ID );
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (12919 => 12920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-02-01 18:01:23 UTC (rev 12919)
+++ trunk/wp-admin/includes/schema.php 2010-02-01 20:01:14 UTC (rev 12920)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> * @uses $wp_db_version
</span><span class="cx"> */
</span><span class="cx"> function populate_options() {
</span><del>- global $wpdb, $wp_db_version;
</del><ins>+ global $wpdb, $wp_db_version, $current_site;
</ins><span class="cx">
</span><span class="cx"> $guessurl = wp_guess_url();
</span><span class="cx">
</span><span class="lines">@@ -196,7 +196,8 @@
</span><span class="cx"> $options = array(
</span><span class="cx"> 'siteurl' => $guessurl,
</span><span class="cx"> 'blogname' => __('My Blog'),
</span><del>- 'blogdescription' => __('Just another WordPress weblog'),
</del><ins>+ /* translators: blog tagline */
+ 'blogdescription' => __('Just another WordPress site'),
</ins><span class="cx"> 'users_can_register' => 0,
</span><span class="cx"> 'admin_email' => 'you@example.com',
</span><span class="cx"> 'start_of_week' => 1,
</span><span class="lines">@@ -319,6 +320,7 @@
</span><span class="cx">
</span><span class="cx"> // 3.0 multisite
</span><span class="cx"> if ( is_multisite() ) {
</span><ins>+ /* translators: blog tagline */
</ins><span class="cx"> $options[ 'blogdescription' ] = sprintf(__('Just another %s site'), $current_site->site_name );
</span><span class="cx"> $options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (12919 => 12920)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-02-01 18:01:23 UTC (rev 12919)
+++ trunk/wp-admin/menu.php 2010-02-01 20:01:14 UTC (rev 12920)
</span><span class="lines">@@ -33,9 +33,11 @@
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() && is_super_admin() ) {
</span><span class="cx"> $menu[1] = array( '', 'read', 'separator0', '', 'wp-menu-separator' );
</span><del>- $menu[2] = array(__('Site Admin'), '10', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
</del><ins>+ /* translators: Network menu item */
+ $menu[2] = array(__('Network'), '10', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div');
</ins><span class="cx"> $submenu[ 'ms-admin.php' ][1] = array( __('Admin'), 'super_admin', 'ms-admin.php' );
</span><del>- $submenu[ 'ms-admin.php' ][5] = array( __('Blogs'), 'super_admin', 'ms-sites.php' );
</del><ins>+ /* translators: Sites menu item */
+ $submenu[ 'ms-admin.php' ][5] = array( __('Sites'), 'super_admin', 'ms-sites.php' );
</ins><span class="cx"> $submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'super_admin', 'ms-users.php' );
</span><span class="cx"> $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'super_admin', 'ms-themes.php' );
</span><span class="cx"> $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'super_admin', 'ms-options.php' );
</span></span></pre>
</div>
</div>
</body>
</html>