Changeset 16668

Timestamp:

12/01/2010 08:39:15 PM (14 years ago)

Author:

markjaquith

Message:

Doh. [16646] and [16650] were made against the wrong branch. Revert. see #13709. see #15621

Location:

branches/3.0

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/post.php (modified) (2 diffs)

branches/3.0/wp-admin/includes/media.php

@@ -380 +380 @@
 
 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>";
 }
 

branches/3.0/wp-includes/post.php

@@ -801 +801 @@
  * @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()) {
@@ -822 +822 @@
     $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.