Merge with WordPress 2.3.1

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1139 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 0 insertions, 35 deletions

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 175906c..a956dc4 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -445,7 +445,6 @@ function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
 			}
 		} else {
 			$post->iconsize = array($imagesize[0], $imagesize[1]);
-			$constraint = '';
 		}
 	}
 
@@ -492,38 +491,4 @@ function get_the_password_form() {
 	return $output;
 }
 
-/**
- * is_page_template() - Determine wether or not we are in a page template
- *
- * This template tag allows you to determine wether or not you are in a page template.
- * You can optional provide a template name and then the check will be specific to
- * that template.
- *
- * @package Template Tags
- * @global object $wp_query
- * @param string $template The specific template name if specific matching is required
- */
-function is_page_template($template = '') {
-	if (!is_page()) {
-		return false;
-	}
-
-	global $wp_query;
-
-	$page = $wp_query->get_queried_object();
-	$custom_fields = get_post_custom_values('_wp_page_template',$page->ID);
-	$page_template = $custom_fields[0];
-
-	// We have no argument passed so just see if a page_template has been specified
-	if ( empty( $template ) ) {
-		if (!empty( $page_template ) ) {
-			return true;
-		}
-	} elseif ( $template == $page_template) {
-		return true;
-	}
-
-	return false;
-}
-
 ?>