<!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" />
<title>[19699] trunk: Create a network/about.php page and leverage it, to prevent the dashboard from switching to the blog admin.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19699">19699</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-01-06 17:53:41 +0000 (Fri, 06 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Create a network/about.php page and leverage it, to prevent the dashboard from switching to the blog admin. fixes <a href="http://core.trac.wordpress.org/ticket/19762">#19762</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminaboutphp">trunk/wp-admin/about.php</a></li>
<li><a href="#trunkwpadmincreditsphp">trunk/wp-admin/credits.php</a></li>
<li><a href="#trunkwpadminfreedomsphp">trunk/wp-admin/freedoms.php</a></li>
<li><a href="#trunkwpadminincludesupdatecorephp">trunk/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkaboutphp">trunk/wp-admin/network/about.php</a></li>
<li><a href="#trunkwpadminnetworkcreditsphp">trunk/wp-admin/network/credits.php</a></li>
<li><a href="#trunkwpadminnetworkfreedomsphp">trunk/wp-admin/network/freedoms.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminaboutphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/about.php (19698 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/about.php 2012-01-06 17:11:48 UTC (rev 19698)
+++ trunk/wp-admin/about.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx"> list( $display_version ) = explode( '-', $wp_version );
</span><span class="cx">
</span><del>-include( './admin-header.php' );
</del><ins>+include( ABSPATH . 'wp-admin/admin-header.php' );
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="wrap about-wrap">
</span><span class="cx">
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx">
</span><span class="cx"> <div class="feature-section images-stagger-right">
</span><span class="cx"> <div class="feature-images">
</span><del>- <img src="images/screenshots/media-icon.png" width="200" class="angled-right" />
- <img src="images/screenshots/drag-and-drop.png" width="200" class="angled-left" />
</del><ins>+ <img src="<?php echo admin_url( 'images/screenshots/media-icon.png' ); ?>" width="200" class="angled-right" />
+ <img src="<?php echo admin_url( 'images/screenshots/drag-and-drop.png' ); ?>" width="200" class="angled-left" />
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="left-feature">
</span><span class="cx"> <h4><?php _e( 'File Type Detection' ); ?></h4>
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx">
</span><span class="cx"> <div class="feature-section screenshot-features">
</span><span class="cx"> <div class="angled-left">
</span><del>- <img src="images/screenshots/admin-flyouts.png" />
</del><ins>+ <img src="<?php echo admin_url( 'images/screenshots/admin-flyouts.png' ); ?>" />
</ins><span class="cx"> <h4><?php _e( 'Responsive Design' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'Certain dashboard screens have been updated to look better at various sizes, including improved iPad/tablet support.' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="angled-right">
</span><del>- <img src="images/screenshots/help-screen.png" />
</del><ins>+ <img src="<?php echo admin_url( 'images/screenshots/help-screen.png' ); ?>" />
</ins><span class="cx"> <h4><?php _e( 'Help Tabs' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'The Help tabs located in the upper corner of the dashboard screens below your name have gotten a facelift. Help content is broken into smaller sections for easier access, with links to relevant documentation and the support forums always visible.' ); ?></p>
</span><span class="cx"> </div>
</span><span class="lines">@@ -86,8 +86,8 @@
</span><span class="cx">
</span><span class="cx"> <div class="feature-section images-stagger-right">
</span><span class="cx"> <div class="feature-images">
</span><del>- <img src="images/screenshots/new-feature-pointer.png" class="angled-right" />
- <img src="images/screenshots/welcome-screen.png" class="angled-left" />
</del><ins>+ <img src="<?php echo admin_url( 'images/screenshots/new-feature-pointer.png' ); ?>" class="angled-right" />
+ <img src="<?php echo admin_url( 'images/screenshots/welcome-screen.png' ); ?>" class="angled-left" />
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="left-feature">
</span><span class="cx"> <h4><?php _e( 'New Feature Pointers' ); ?></h4>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <div class="feature-section three-col">
</span><span class="cx"> <div>
</span><span class="cx"> <h4><?php _e( 'Better Co-Editing' ); ?></h4>
</span><del>- <img src="images/screenshots/coediting.png" class="element-screenshot" />
</del><ins>+ <img src="<?php echo admin_url( 'images/screenshots/coediting.png' ); ?>" class="element-screenshot" />
</ins><span class="cx"> <p><?php _e( 'Have you ever gone to edit a post after someone else has finished with it, only to get an alert that tells you the other person is still editing the post? From now on, you&#8217;ll only get that alert if another person is still on the editing screen &mdash; no more time lag.' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> <div>
</span><span class="lines">@@ -161,17 +161,18 @@
</span><span class="cx">
</span><span class="cx"> <div class="return-to-dashboard">
</span><span class="cx"> <?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
</span><del>- <a href="<?php echo esc_url( network_admin_url( 'update-core.php' ) ); ?>"><?php
</del><ins>+ <a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>"><?php
</ins><span class="cx"> is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' );
</span><span class="cx"> ?></a> |
</span><span class="cx"> <?php endif; ?>
</span><del>- <a href="<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Go to Dashboard &rarr; Home' ); ?></a>
</del><ins>+ <a href="<?php echo esc_url( self_admin_url() ); ?>"><?php
+ is_network_admin() ? _e( 'Go to Dashboard' ) : _e( 'Go to Dashboard &rarr; Home' ); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-include( './admin-footer.php' );
</del><ins>+include( ABSPATH . 'wp-admin/admin-footer.php' );
</ins><span class="cx">
</span><span class="cx"> // These are strings we may use to describe maintenance/security releases, where we aim for no new strings.
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpadmincreditsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/credits.php (19698 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/credits.php 2012-01-06 17:11:48 UTC (rev 19698)
+++ trunk/wp-admin/credits.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> list( $display_version ) = explode( '-', $wp_version );
</span><span class="cx">
</span><del>-include( './admin-header.php' );
</del><ins>+include( ABSPATH . 'wp-admin/admin-header.php' );
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="wrap about-wrap">
</span><span class="cx">
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> 'http://wordpress.org/about/',
</span><span class="cx"> /* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
</span><span class="cx"> __( 'http://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';
</span><del>- include( './admin-footer.php' );
</del><ins>+ include( ABSPATH . 'wp-admin/admin-footer.php' );
</ins><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-include( './admin-footer.php' );
</del><ins>+include( ABSPATH . 'wp-admin/admin-footer.php' );
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminfreedomsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/freedoms.php (19698 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/freedoms.php 2012-01-06 17:11:48 UTC (rev 19698)
+++ trunk/wp-admin/freedoms.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx">
</span><span class="cx"> list( $display_version ) = explode( '-', $wp_version );
</span><span class="cx">
</span><del>-include( './admin-header.php' );
</del><ins>+include( ABSPATH . 'wp-admin/admin-header.php' );
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="wrap about-wrap">
</span><span class="cx">
</span><span class="lines">@@ -54,4 +54,4 @@
</span><span class="cx"> <p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="http://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
</span><span class="cx">
</span><span class="cx"> </div>
</span><del>-<?php include( './admin-footer.php' ); ?>
</del><ins>+<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
</ins></span></pre></div>
<a id="trunkwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/update-core.php (19698 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/update-core.php 2012-01-06 17:11:48 UTC (rev 19698)
+++ trunk/wp-admin/includes/update-core.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -601,7 +601,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Redirect to the About WordPress page after a successful upgrade.
</span><span class="cx"> *
</span><del>- * This function is only needed when the existing install is older than 3.3.0.
</del><ins>+ * This function is only needed when the existing install is older than 3.3.0 (3.4.0 for multisite).
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="lines">@@ -609,8 +609,13 @@
</span><span class="cx"> function _redirect_to_about_wordpress( $new_version ) {
</span><span class="cx"> global $wp_version, $pagenow, $action;
</span><span class="cx">
</span><del>- if ( version_compare( $wp_version, '3.3', '>=' ) )
</del><ins>+ if ( is_multisite() ) {
+ // Change to self_admin_url().
+ if ( version_compare( $wp_version, '3.4-alpha', '>=' ) )
+ return;
+ } elseif ( version_compare( $wp_version, '3.3', '>=' ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Ensure we only run this on the update-core.php page. wp_update_core() could be called in other contexts.
</span><span class="cx"> if ( 'update-core.php' != $pagenow )
</span><span class="lines">@@ -624,12 +629,12 @@
</span><span class="cx">
</span><span class="cx"> // See do_core_upgrade()
</span><span class="cx"> show_message( __('WordPress updated successfully') );
</span><del>- show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
- show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
</del><ins>+ show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
+ show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $new_version, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
</ins><span class="cx"> echo '</div>';
</span><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><del>-window.location = '<?php echo admin_url( 'about.php?updated' ); ?>';
</del><ins>+window.location = '<?php echo self_admin_url( 'about.php?updated' ); ?>';
</ins><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkaboutphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/network/about.php (0 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/about.php (rev 0)
+++ trunk/wp-admin/network/about.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<?php
+/**
+ * Network About administration panel.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 3.1.0
+ */
+
+/** Load WordPress Administration Bootstrap */
+require_once( './admin.php' );
+
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
+require( '../about.php' );
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkcreditsphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/network/credits.php (0 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/credits.php (rev 0)
+++ trunk/wp-admin/network/credits.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<?php
+/**
+ * Network Credits administration panel.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 3.1.0
+ */
+
+/** Load WordPress Administration Bootstrap */
+require_once( './admin.php' );
+
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
+require( '../credits.php' );
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminnetworkfreedomsphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/network/freedoms.php (0 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/freedoms.php (rev 0)
+++ trunk/wp-admin/network/freedoms.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<?php
+/**
+ * Network Freedoms administration panel.
+ *
+ * @package WordPress
+ * @subpackage Multisite
+ * @since 3.1.0
+ */
+
+/** Load WordPress Administration Bootstrap */
+require_once( './admin.php' );
+
+if ( ! is_multisite() )
+ wp_die( __( 'Multisite support is not enabled.' ) );
+
+require( '../freedoms.php' );
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (19698 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2012-01-06 17:11:48 UTC (rev 19698)
+++ trunk/wp-admin/update-core.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> echo '<p>' . __( 'While your site is being updated, it will be in maintenance mode. As soon as your updates are complete, your site will return to normal.' ) . '</p>';
</span><span class="cx"> } else {
</span><span class="cx"> list( $normalized_version ) = explode( '-', $wp_version );
</span><del>- echo '<p>' . sprintf( __( '<a href="%s">Learn more about WordPress %s</a>.' ), esc_url( admin_url( 'about.php' ) ), $normalized_version ) . '</p>';
</del><ins>+ echo '<p>' . sprintf( __( '<a href="%s">Learn more about WordPress %s</a>.' ), esc_url( self_admin_url( 'about.php' ) ), $normalized_version ) . '</p>';
</ins><span class="cx"> }
</span><span class="cx"> dismissed_updates();
</span><span class="cx">
</span><span class="lines">@@ -382,12 +382,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> show_message( __('WordPress updated successfully') );
</span><del>- show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $result, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
- show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $result, esc_url( admin_url( 'about.php?updated' ) ) ) . '</span>' );
</del><ins>+ show_message( '<span class="hide-if-no-js">' . sprintf( __( 'Welcome to WordPress %1$s. You will be redirected to the About WordPress screen. If not, click <a href="%s">here</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
+ show_message( '<span class="hide-if-js">' . sprintf( __( 'Welcome to WordPress %1$s. <a href="%2$s">Learn more</a>.' ), $result, esc_url( self_admin_url( 'about.php?updated' ) ) ) . '</span>' );
</ins><span class="cx"> ?>
</span><span class="cx"> </div>
</span><span class="cx"> <script type="text/javascript">
</span><del>- window.location = '<?php echo admin_url( 'about.php?upgraded' ); ?>';
</del><ins>+ window.location = '<?php echo self_admin_url( 'about.php?upgraded' ); ?>';
</ins><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (19698 => 19699)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2012-01-06 17:11:48 UTC (rev 19698)
+++ trunk/wp-includes/admin-bar.php 2012-01-06 17:53:41 UTC (rev 19699)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'id' => 'wp-logo',
</span><span class="cx"> 'title' => '<span class="ab-icon"></span>',
</span><del>- 'href' => admin_url( 'about.php' ),
</del><ins>+ 'href' => is_network_admin() ? network_admin_url( 'about.php' ) : admin_url( 'about.php' ),
</ins><span class="cx"> 'meta' => array(
</span><span class="cx"> 'title' => __('About WordPress'),
</span><span class="cx"> ),
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> 'parent' => 'wp-logo',
</span><span class="cx"> 'id' => 'about',
</span><span class="cx"> 'title' => __('About WordPress'),
</span><del>- 'href' => admin_url('about.php'),
</del><ins>+ 'href' => is_network_admin() ? network_admin_url( 'about.php' ) : admin_url( 'about.php' ),
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>