<!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>[12332] trunk/wp-includes:
Check the correct global in get_page and also ensure that the cap check for deleting pages copes for the default page we edit when adding new
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12332">12332</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-12-07 18:01:02 +0000 (Mon, 07 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check the correct global in get_page and also ensure that the cap check for deleting pages copes for the default page we edit when adding new. Fixes <a href="http://trac.wordpress.org/ticket/11203">#11203</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (12331 => 12332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2009-12-07 17:57:48 UTC (rev 12331)
+++ trunk/wp-includes/capabilities.php 2009-12-07 18:01:02 UTC (rev 12332)
</span><span class="lines">@@ -818,6 +818,14 @@
</span><span class="cx"> $page_author_data = get_userdata( $page->post_author );
</span><span class="cx"> //echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br />";
</span><span class="cx"> // If the user is the author...
</span><ins>+
+ if ('' != $page->post_author) {
+ $page_author_data = get_userdata( $page->post_author );
+ } else {
+ //No author set yet so default to current user for cap checks
+ $page_author_data = $author_data;
+ }
+
</ins><span class="cx"> if ( $user_id == $page_author_data->ID ) {
</span><span class="cx"> // If the page is published...
</span><span class="cx"> if ( $page->post_status == 'publish' ) {
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (12331 => 12332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2009-12-07 17:57:48 UTC (rev 12331)
+++ trunk/wp-includes/post.php 2009-12-07 18:01:02 UTC (rev 12332)
</span><span class="lines">@@ -2279,8 +2279,8 @@
</span><span class="cx"> */
</span><span class="cx"> function &get_page(&$page, $output = OBJECT, $filter = 'raw') {
</span><span class="cx"> if ( empty($page) ) {
</span><del>- if ( isset( $GLOBALS['page'] ) && isset( $GLOBALS['page']->ID ) ) {
- return get_post($GLOBALS['page'], $output, $filter);
</del><ins>+ if ( isset( $GLOBALS['post'] ) && isset( $GLOBALS['post']->ID ) ) {
+ return get_post($GLOBALS['post'], $output, $filter);
</ins><span class="cx"> } else {
</span><span class="cx"> $page = null;
</span><span class="cx"> return $page;
</span></span></pre>
</div>
</div>
</body>
</html>