Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-26 06:45:07 +02:00
Code Issues Projects Releases Wiki Activity

Docs: Revert unintended changes in wp-includes/post.php, mistakenly included in [36497].

Browse Source 
See #34988. See #33701. 

Built from https://develop.svn.wordpress.org/trunk@36498


git-svn-id: http://core.svn.wordpress.org/trunk@36465 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-02-07 02:46:25 +00:00
parent 3785385ea2
commit c55f447ad4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/post.php
View File

@ -1188,9 +1188,9 @@ function register_post_type( $post_type, $args = array() ) {
}
/**
* Un-registers a post type.
* Unregisters a post type.
*
* Can not be used to un-register built-in post types.
* Can not be used to unregister built-in post types.
*
* @since 4.5.0
*
@ -1200,7 +1200,7 @@ function register_post_type( $post_type, $args = array() ) {
* @global array $post_type_meta_caps Used to remove meta capabilities.
* @global array $wp_post_types List of post types.
*
* @param string $post_type Post type to un-register.
* @param string $post_type Post type to unregister.
* @return bool|WP_Error True on success, WP_Error on failure.
*/
function unregister_post_type( $post_type ) {
@ -1210,7 +1210,7 @@ function unregister_post_type( $post_type ) {
$post_type_args = get_post_type_object( $post_type );
// Do not allow un-registering internal post types.
// Do not allow unregistering internal post types.
if ( $post_type_args->_builtin ) {
return new WP_Error( 'invalid_post_type', __( 'Unregistering a built-in post type is not allowed' ) );
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-36497';
$wp_version = '4.5-alpha-36498';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.