<!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>[15558] trunk: is_blog_admin().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15558">15558</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-09-02 15:03:39 +0000 (Thu, 02 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>is_blog_admin(). fixes <a href="http://trac.wordpress.org/ticket/14763">#14763</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (15557 => 15558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-09-02 04:47:57 UTC (rev 15557)
+++ trunk/wp-admin/admin.php 2010-09-02 15:03:39 UTC (rev 15558)
</span><span class="lines">@@ -14,8 +14,10 @@
</span><span class="cx"> if ( !defined('WP_ADMIN') )
</span><span class="cx"> define('WP_ADMIN', TRUE);
</span><span class="cx">
</span><del>-if ( !defined('WP_NETWORK_ADMIN') )
</del><ins>+if ( !defined('WP_NETWORK_ADMIN') ) {
</ins><span class="cx"> define('WP_NETWORK_ADMIN', FALSE);
</span><ins>+ define('WP_BLOG_ADMIN', TRUE);
+}
</ins><span class="cx">
</span><span class="cx"> if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
</span><span class="cx"> define('WP_LOAD_IMPORTERS', true);
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (15557 => 15558)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-09-02 04:47:57 UTC (rev 15557)
+++ trunk/wp-includes/load.php 2010-09-02 15:03:39 UTC (rev 15558)
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Whether the current request is in WordPress admin Panel
</del><ins>+ * Whether the current request is for a network or blog admin page
</ins><span class="cx"> *
</span><span class="cx"> * Does not inform on whether the user is an admin! Use capability checks to
</span><span class="cx"> * tell if the user should be accessing a section or not.
</span><span class="lines">@@ -569,8 +569,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Whether the current request is in WordPress network admin Panel
</del><ins>+ * Whether the current request is for a blog admin screen /wp-admin/
</ins><span class="cx"> *
</span><ins>+ * Does not inform on whether the user is a blog admin! Use capability checks to
+ * tell if the user should be accessing a section or not.
+ *
+ * @since 3.1.0
+ *
+ * @return bool True if inside WordPress network administration pages.
+ */
+function is_blog_admin() {
+ if ( defined( 'WP_BLOG_ADMIN' ) )
+ return WP_BLOG_ADMIN;
+ return false;
+}
+
+/**
+ * Whether the current request is for a network admin screen /wp-admin/network/
+ *
</ins><span class="cx"> * Does not inform on whether the user is a network admin! Use capability checks to
</span><span class="cx"> * tell if the user should be accessing a section or not.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>