<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[11958] trunk:
Eliminate the redundant and confusing comment threading depth of 1.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11958">11958</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2009-09-22 06:00:46 +0000 (Tue, 22 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate the redundant and confusing comment threading depth of 1. Threading starts at 2 now. fixes <a href="http://trac.wordpress.org/ticket/10829">#10829</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (11957 => 11958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2009-09-21 21:43:41 UTC (rev 11957)
+++ trunk/wp-admin/includes/upgrade.php 2009-09-22 06:00:46 UTC (rev 11958)
</span><span class="lines">@@ -346,6 +346,9 @@
</span><span class="cx"> if ( $wp_current_db_version < 10360 )
</span><span class="cx"> upgrade_280();
</span><span class="cx">
</span><ins>+ if ( $wp_current_db_version < 11958 )
+ upgrade_290();
+
</ins><span class="cx"> maybe_disable_automattic_widgets();
</span><span class="cx">
</span><span class="cx"> update_option( 'db_version', $wp_db_version );
</span><span class="lines">@@ -983,7 +986,24 @@
</span><span class="cx"> populate_roles_280();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Execute changes made in WordPress 2.9.
+ *
+ * @since 2.9.0
+ */
+function upgrade_290() {
+ global $wp_current_db_version;
</ins><span class="cx">
</span><ins>+ if ( $wp_current_db_version < 11958 ) {
+ // Previously, setting depth to 1 would redundantly disable threading, but now 2 is the minimum depth to avoid confusion
+ if ( get_option( 'thread_comments_depth' ) == '1' ) {
+ update_option( 'thread_comments_depth', 2 );
+ update_option( 'thread_comments', 0 );
+ }
+ }
+}
+
+
</ins><span class="cx"> // The functions we use to actually do stuff
</span><span class="cx">
</span><span class="cx"> // General
</span></span></pre></div>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (11957 => 11958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2009-09-21 21:43:41 UTC (rev 11957)
+++ trunk/wp-admin/options-discussion.php 2009-09-22 06:00:46 UTC (rev 11958)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> $maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
</span><span class="cx">
</span><span class="cx"> $thread_comments_depth = '</label><select name="thread_comments_depth" id="thread_comments_depth">';
</span><del>-for ( $i = 1; $i <= $maxdeep; $i++ ) {
</del><ins>+for ( $i = 2; $i <= $maxdeep; $i++ ) {
</ins><span class="cx"> $thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
</span><span class="cx"> if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
</span><span class="cx"> $thread_comments_depth .= ">$i</option>";
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (11957 => 11958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2009-09-21 21:43:41 UTC (rev 11957)
+++ trunk/wp-includes/version.php 2009-09-22 06:00:46 UTC (rev 11958)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 11943;
</del><ins>+$wp_db_version = 11958;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>