<!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>[16668] branches/3.0: Doh.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16668">16668</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-12-01 20:39:15 +0000 (Wed, 01 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Doh. <a href="http://trac.wordpress.org/changeset/16646">[16646]</a> and <a href="http://trac.wordpress.org/changeset/16650">[16650]</a> were made against the wrong branch. Revert. see <a href="http://trac.wordpress.org/ticket/13709">#13709</a>. see <a href="http://trac.wordpress.org/ticket/15621">#15621</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches30wpadminincludesmediaphp">branches/3.0/wp-admin/includes/media.php</a></li>
<li><a href="#branches30wpincludespostphp">branches/3.0/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches30wpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-admin/includes/media.php (16667 => 16668)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-admin/includes/media.php 2010-12-01 20:23:57 UTC (rev 16667)
+++ branches/3.0/wp-admin/includes/media.php 2010-12-01 20:39:15 UTC (rev 16668)
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> add_action( 'media_buttons', 'media_buttons' );
</span><span class="cx">
</span><span class="cx"> function _media_button($title, $icon, $type) {
</span><del>- return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' onclick='return false;' /></a>";
</del><ins>+ return "<a href='" . esc_url( get_upload_iframe_src($type) ) . "' id='add_$type' class='thickbox' title='$title'><img src='" . esc_url( admin_url( $icon ) ) . "' alt='$title' /></a>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_upload_iframe_src($type) {
</span></span></pre></div>
<a id="branches30wpincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/3.0/wp-includes/post.php (16667 => 16668)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.0/wp-includes/post.php 2010-12-01 20:23:57 UTC (rev 16667)
+++ branches/3.0/wp-includes/post.php 2010-12-01 20:39:15 UTC (rev 16668)
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $post_type Name of the post type.
</span><span class="cx"> * @param array|string $args See above description.
</span><del>- * @return object|WP_Error the registered post type object, or an error object
</del><ins>+ * @return object the registered post type object
</ins><span class="cx"> */
</span><span class="cx"> function register_post_type($post_type, $args = array()) {
</span><span class="cx"> global $wp_post_types, $wp_rewrite, $wp;
</span><span class="lines">@@ -822,9 +822,6 @@
</span><span class="cx"> $post_type = sanitize_user($post_type, true);
</span><span class="cx"> $args->name = $post_type;
</span><span class="cx">
</span><del>- if ( strlen( $post_type ) > 20 )
- return new WP_Error( 'post_type_too_long', __( 'Post types cannot exceed 20 characters in length' ) );
-
</del><span class="cx"> // If not set, default to the setting for public.
</span><span class="cx"> if ( null === $args->publicly_queryable )
</span><span class="cx"> $args->publicly_queryable = $args->public;
</span></span></pre>
</div>
</div>
</body>
</html>