From 3d07eac72467132c99c20b0db85115080e0293fc Mon Sep 17 00:00:00 2001
From: Weston Ruter <weston@xwp.co>
Date: Sun, 1 Jul 2018 20:49:53 -0700
Subject: [PATCH] Discard matching is_home when there are other matching
 templates

---
 includes/class-amp-theme-support.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 65665ade482..18a8f0e593c 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -489,7 +489,7 @@ public static function get_template_availability( $query = null ) {
 			if ( is_string( $callback ) && 'is_' === substr( $callback, 0, 3 ) && method_exists( $query, $callback ) ) {
 				$is_match = call_user_func( array( $query, $callback ) );
 			} elseif ( is_callable( $callback ) ) {
-				$is_match = call_user_func( $callback );
+				$is_match = call_user_func( $callback, $query );
 			} else {
 				/* translators: %s is the supportable template ID. */
 				_doing_it_wrong( __FUNCTION__, esc_html__( 'Supportable template "%s" does not have a callable callback.', 'amp' ), '1.0' );
@@ -535,6 +535,15 @@ public static function get_template_availability( $query = null ) {
 			}
 		}
 
+		// The is_home() condition is the default so discard it if there are other matching templates.
+		if ( count( $matching_templates ) > 1 && isset( $matching_templates['is_home'] ) ) {
+			unset( $matching_templates['is_home'] );
+		}
+
+		/*
+		 * If there are more than one matching templates, then something is probably not right.
+		 * Template conditions need to be set up properly to prevent this from happening.
+		 */
 		if ( count( $matching_templates ) > 1 ) {
 			_doing_it_wrong( __FUNCTION__, esc_html__( 'Did not expect there to be more than one matching template. Did you filter amp_supportable_templates to not honor the template hierarchy?', 'amp' ), '1.0' );
 		}