Changeset 5608

Timestamp:

01/30/2015 05:16:17 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Prevent notices and warnings when template stack is empty. Fixes #2749.

Location:

trunk/src/includes/core

Files:

• template-functions.php (modified) (1 diff)
• theme-compat.php (modified) (1 diff)

trunk/src/includes/core/template-functions.php

@@ -314 +314 @@
         // Add 'bbp_template_stack' to the current filter array
         $wp_current_filter[] = $tag;
+
+        // Bail if no stack setup
+        if ( empty( $wp_filter[ $tag ] ) ) {
+                return array();
+        }
 
         // Sort

trunk/src/includes/core/theme-compat.php

@@ -101 +101 @@
         }
 
-        // Set the active theme compat theme
-        $bbp->theme_compat->theme = $bbp->theme_compat->packages[$theme];
+        // Try to set the active theme compat theme. If it's not in the registered
+        // packages array, it doesn't exist, so do nothing with it.
+        if ( isset( $bbp->theme_compat->packages[$theme] ) ) {
+                $bbp->theme_compat->theme = $bbp->theme_compat->packages[$theme];
+        }
 }