Changeset 16789

Timestamp:

12/08/2010 07:51:40 AM (16 years ago)

Author:

scribu

Message:

Use has_archive in get_post_type_archive_link(). See #13818

File:

• trunk/wp-includes/link-template.php (modified) (1 diff)

trunk/wp-includes/link-template.php

@@ -837 +837 @@
                 return false;
 
-        if ( ! is_array( $post_type_obj->rewrite ) || false === $post_type_obj->rewrite['archive'] )
+        if ( ! $post_type_obj->has_archive )
                 return false;
 
-        if ( get_option( 'permalink_structure' ) ) {
-                $struct = ( true === $post_type_obj->rewrite['archive'] ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->rewrite['archive'];
+        if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
+                $struct = $post_type_obj->rewrite['slug'];
                 if ( $post_type_obj->rewrite['with_front'] )
                         $struct = $wp_rewrite->front . $struct;