Permalink
Browse files

Doh. [16646] and [16650] were made against the wrong branch. Revert. …

…see #13709. see #15621

git-svn-id: http://svn.automattic.com/wordpress/branches/3.0@16668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent b100afd commit 42ee855438dab0a7c4c5e9033ee3bf26b67fc478 markjaquith committed Dec 1, 2010
Showing with 2 additions and 5 deletions.
  1. +1 −1 wp-admin/includes/media.php
  2. +1 −4 wp-includes/post.php
View
2 wp-admin/includes/media.php
@@ -379,7 +379,7 @@ function media_buttons() {
add_action( 'media_buttons', 'media_buttons' );
function _media_button($title, $icon, $type) {
- 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>";
+ 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>";
}
function get_upload_iframe_src($type) {
View
5 wp-includes/post.php
@@ -800,7 +800,7 @@ function get_post_types( $args = array(), $output = 'names', $operator = 'and' )
*
* @param string $post_type Name of the post type.
* @param array|string $args See above description.
- * @return object|WP_Error the registered post type object, or an error object
+ * @return object the registered post type object
*/
function register_post_type($post_type, $args = array()) {
global $wp_post_types, $wp_rewrite, $wp;
@@ -822,9 +822,6 @@ function register_post_type($post_type, $args = array()) {
$post_type = sanitize_user($post_type, true);
$args->name = $post_type;
- if ( strlen( $post_type ) > 20 )
- return new WP_Error( 'post_type_too_long', __( 'Post types cannot exceed 20 characters in length' ) );
-
// If not set, default to the setting for public.
if ( null === $args->publicly_queryable )
$args->publicly_queryable = $args->public;

0 comments on commit 42ee855

Please sign in to comment.