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

Args is an object, not an array. props duck_, aaroncampbell. see #19275. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19740 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-01-23 19:32:39 +00:00
parent ba2c3e345e
commit 674196a2ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/post.php
View File

@ -999,8 +999,8 @@ function register_post_type($post_type, $args = array()) {
if ( ! isset( $args->rewrite['feeds'] ) || ! $args->has_archive )
$args->rewrite['feeds'] = (bool) $args->has_archive;
if ( ! isset( $args->rewrite['ep_mask'] ) ) {
if ( isset( $args['permalink_epmask'] ) )
$args->rewrite['ep_mask'] = $args['permalink_epmask'];
if ( isset( $args->permalink_epmask ) )
$args->rewrite['ep_mask'] = $args->permalink_epmask;
else
$args->rewrite['ep_mask'] = EP_PERMALINK;
}