WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docs: Add a missing version to the file header for wp-admin/term.php, introduced in [36308]. 

See #34988. See #33701.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36464 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-02-07 02:43:26 +00:00
parent f3aeb0def3
commit 3785385ea2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/term.php
View File

@ -4,6 +4,7 @@
* *
* @package WordPress * @package WordPress
* @subpackage Administration * @subpackage Administration
* @since 4.5.0
*/ */
/** WordPress Administration Bootstrap */ /** WordPress Administration Bootstrap */

8
wp-includes/post.php
View File

@ -1188,9 +1188,9 @@ function register_post_type( $post_type, $args = array() ) {
} }
/** /**
* Unregister a post type. * Un-registers a post type.
* *
* Can not be used to unregister built-in post types. * Can not be used to un-register built-in post types.
* *
* @since 4.5.0 * @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 $post_type_meta_caps Used to remove meta capabilities.
* @global array $wp_post_types List of post types. * @global array $wp_post_types List of post types.
* *
* @param string $post_type Post type key. * @param string $post_type Post type to un-register.
* @return bool|WP_Error True on success, WP_Error on failure. * @return bool|WP_Error True on success, WP_Error on failure.
*/ */
function unregister_post_type( $post_type ) { 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 ); $post_type_args = get_post_type_object( $post_type );
// Do not allow unregistering internal post types. // Do not allow un-registering internal post types.
if ( $post_type_args->_builtin ) { if ( $post_type_args->_builtin ) {
return new WP_Error( 'invalid_post_type', __( 'Unregistering a built-in post type is not allowed' ) ); 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 * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36496'; $wp_version = '4.5-alpha-36497';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.