From b624542cc52d58a1e0c4faa35596f926032f2eeb Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 8 Dec 2010 09:15:09 +0000
Subject: [PATCH] Revert logic change made in [16789]. See #13818

git-svn-id: http://svn.automattic.com/wordpress/trunk@16793 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/link-template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 4fe97ddfc..e6060d9bf 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -840,7 +840,7 @@ function get_post_type_archive_link( $post_type ) {
 		return false;
 
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
-		$struct = $post_type_obj->rewrite['slug'];
+		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
 		if ( $post_type_obj->rewrite['with_front'] )
 			$struct = $wp_rewrite->front . $struct;
 		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );