Changeset 8461

Timestamp:

05/31/2014 04:20:30 PM (11 years ago)

Author:

johnjamesjacoby

Message:

In bp_register_template_stack() wrap function_exists() check with is_array() check. Allows class methods to be used as a callback for adding new template stack locations. Fixes #5671.

File:

• trunk/src/bp-core/bp-core-template-loader.php (modified) (3 diffs)

trunk/src/bp-core/bp-core-template-loader.php

@@ -125 +125 @@
  * @todo Make 'callable' instead of 'function'.
  *
- * @param string $location Callback function that returns the stack location.
+ * @param string $location_callback Callback function that returns the stack location.
  * @param int $priority Optional. The priority parameter as passed to
  *        add_filter(). Default: 10.
@@ -133 +133 @@
 
     // Bail if no location, or function does not exist
-    if ( empty( $location_callback ) || ! function_exists( $location_callback ) )
+    if ( empty( $location_callback ) ) {
         return false;
+    }
+
+    // Bail if callback function does not exist
+    if ( ! is_array( $location_callback ) ) {
+        if ( ! function_exists( $location_callback ) ) {
+            return false;
+        }
+    }
 
     // Add location callback to template stack
@@ -147 +155 @@
  * @see bp_register_template_stack()
  *
- * @param string $location Callback function that returns the stack location.
+ * @param string $location_callback Callback function that returns the stack location.
  * @param int $priority Optional. The priority parameter passed to
  *        {@link bp_register_template_stack()}. Default: 10.