<!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>[14399] trunk: Handle page hierarchy when showing the sample permalink.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14399">14399</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-03 20:10:26 +0000 (Mon, 03 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle page hierarchy when showing the sample permalink. props duck_, fixes <a href="http://trac.wordpress.org/ticket/12327">#12327</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14398 => 14399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-05-03 20:05:46 UTC (rev 14398)
+++ trunk/wp-admin/includes/post.php 2010-05-03 20:10:26 UTC (rev 14399)
</span><span class="lines">@@ -1036,7 +1036,7 @@
</span><span class="cx">
</span><span class="cx"> // Handle page hierarchy
</span><span class="cx"> if ( $ptype->hierarchical ) {
</span><del>- $uri = get_page_uri($post->ID);
</del><ins>+ $uri = get_page_uri($post);
</ins><span class="cx"> $uri = untrailingslashit($uri);
</span><span class="cx"> $uri = strrev( stristr( strrev( $uri ), '/' ) );
</span><span class="cx"> $uri = untrailingslashit($uri);
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14398 => 14399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-05-03 20:05:46 UTC (rev 14398)
+++ trunk/wp-includes/post.php 2010-05-03 20:10:26 UTC (rev 14399)
</span><span class="lines">@@ -2908,11 +2908,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><del>- * @param int $page_id Page ID.
</del><ins>+ * @param mixed $page Page object or page ID.
</ins><span class="cx"> * @return string Page URI.
</span><span class="cx"> */
</span><del>-function get_page_uri($page_id) {
- $page = get_page($page_id);
</del><ins>+function get_page_uri($page) {
+ if ( ! is_object($page) )
+ $page = get_page($page);
</ins><span class="cx"> $uri = $page->post_name;
</span><span class="cx">
</span><span class="cx"> // A page cannot be it's own parent.
</span></span></pre>
</div>
</div>
</body>
</html>