<!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>[13075] trunk/wp-includes/post.php: Use correct var name.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13075">13075</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-13 02:42:17 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use correct var name. Props firebird75. Whitespace cleanup in wp_unique_post_slug(). Fixes <a href="http://trac.wordpress.org/ticket/12078">#12078</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (13074 => 13075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-02-13 02:35:41 UTC (rev 13074)
+++ trunk/wp-includes/post.php 2010-02-13 02:42:17 UTC (rev 13075)
</span><span class="lines">@@ -2292,7 +2292,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Given the desired slug and some post details computes a unique slug for the post.
</del><ins>+ * Computes a unique slug for the post, when given the desired slug and some post details.
</ins><span class="cx"> *
</span><span class="cx"> * @global wpdb $wpdb
</span><span class="cx"> * @global WP_Rewrite $wp_rewrite
</span><span class="lines">@@ -2303,58 +2303,58 @@
</span><span class="cx"> * @param integer $post_parent
</span><span class="cx"> * @return string unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
</span><span class="cx"> */
</span><del>-function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent) {
</del><ins>+function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
</ins><span class="cx"> if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) )
</span><span class="cx"> return $slug;
</span><span class="cx">
</span><span class="cx"> global $wpdb, $wp_rewrite;
</span><span class="cx">
</span><span class="cx"> $feeds = $wp_rewrite->feeds;
</span><del>- if ( !is_array($feeds) )
</del><ins>+ if ( ! is_array( $feeds ) )
</ins><span class="cx"> $feeds = array();
</span><span class="cx">
</span><del>- $hierarchical_post_types = apply_filters('hierarchical_post_types', array('page'));
</del><ins>+ $hierarchical_post_types = apply_filters( 'hierarchical_post_types', array( 'page' ) );
</ins><span class="cx"> if ( 'attachment' == $post_type ) {
</span><span class="cx"> // Attachment slugs must be unique across all types.
</span><span class="cx"> $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
</span><del>- $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
</del><ins>+ $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
</ins><span class="cx">
</span><del>- if ( $post_name_check || in_array($slug, $feeds) ) {
</del><ins>+ if ( $post_name_check || in_array( $slug, $feeds ) ) {
</ins><span class="cx"> $suffix = 2;
</span><span class="cx"> do {
</span><del>- $alt_post_name = substr($slug, 0, 200-(strlen($suffix)+1)). "-$suffix";
- $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_ID));
</del><ins>+ $alt_post_name = substr ($slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+ $post_name_check = $wpdb->get_var( $wpdb->prepare($check_sql, $alt_post_name, $post_ID ) );
</ins><span class="cx"> $suffix++;
</span><del>- } while ($post_name_check);
</del><ins>+ } while ( $post_name_check );
</ins><span class="cx"> $slug = $alt_post_name;
</span><span class="cx"> }
</span><del>- } elseif ( in_array($post_type, $hierarchical_post_types) ) {
- // Page slugs must be unique within their own trees. Pages are in a
- // separate namespace than posts so page slugs are allowed to overlap post slugs.
- $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode("', '", esc_sql($hierarchical_post_types)) . "' ) AND ID != %d AND post_parent = %d LIMIT 1";
- $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID, $post_parent));
</del><ins>+ } elseif ( in_array( $post_type, $hierarchical_post_types ) ) {
+ // Page slugs must be unique within their own trees. Pages are in a separate
+ // namespace than posts so page slugs are allowed to overlap post slugs.
+ $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode( "', '", esc_sql( $hierarchical_post_types ) ) . "' ) AND ID != %d AND post_parent = %d LIMIT 1";
+ $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID, $post_parent ) );
</ins><span class="cx">
</span><del>- if ( $post_name_check || in_array($slug, $feeds) ) {
</del><ins>+ if ( $post_name_check || in_array( $slug, $feeds ) ) {
</ins><span class="cx"> $suffix = 2;
</span><span class="cx"> do {
</span><del>- $alt_post_name = substr($slug, 0, 200-(strlen($suffix)+1)). "-$suffix";
- $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_ID, $post_parent));
</del><ins>+ $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+ $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID, $post_parent ) );
</ins><span class="cx"> $suffix++;
</span><del>- } while ($post_name_check);
</del><ins>+ } while ( $post_name_check );
</ins><span class="cx"> $slug = $alt_post_name;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Post slugs must be unique across all posts.
</span><span class="cx"> $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
</span><del>- $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID));
</del><ins>+ $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
</ins><span class="cx">
</span><del>- if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
</del><ins>+ if ( $post_name_check || in_array( $slug, $feeds ) ) {
</ins><span class="cx"> $suffix = 2;
</span><span class="cx"> do {
</span><del>- $alt_post_name = substr($slug, 0, 200-(strlen($suffix)+1)). "-$suffix";
- $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID));
</del><ins>+ $alt_post_name = substr( $slug, 0, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
+ $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
</ins><span class="cx"> $suffix++;
</span><del>- } while ($post_name_check);
</del><ins>+ } while ( $post_name_check );
</ins><span class="cx"> $slug = $alt_post_name;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>