Changeset 8463

Timestamp:

05/31/2014 11:44:12 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Replace function_exists() checks with is_callable() in template stack functions. Props boonebgorges. See: #5671

File:

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

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

@@ -123 +123 @@
  * @since BuddyPress (1.7.0)
  *
- * @todo Make 'callable' instead of 'function'.
- *
  * @param string $location_callback Callback function that returns the stack location.
  * @param int $priority Optional. The priority parameter as passed to
@@ -132 +130 @@
 function bp_register_template_stack( $location_callback = '', $priority = 10 ) {
 
-        // Bail if no location, or function does not exist
-        if ( empty( $location_callback ) ) {
+        // Bail if no location, or function/method is not callable
+        if ( empty( $location_callback ) || ! is_callable( $location_callback ) ) {
                 return false;
-        }
-
-        // Bail if callback function does not exist
-        if ( ! is_array( $location_callback ) ) {
-                if ( ! function_exists( $location_callback ) ) {
-                        return false;
-                }
         }
 
@@ -162 +153 @@
 function bp_deregister_template_stack( $location_callback = '', $priority = 10 ) {
 
-        // Bail if no location, or function does not exist
-        if ( empty( $location_callback ) ) {
+        // Bail if no location, or function/method is not callable
+        if ( empty( $location_callback ) || ! is_callable( $location_callback ) ) {
                 return false;
-        }
-
-        // Bail if callback function does not exist
-        if ( ! is_array( $location_callback ) ) {
-                if ( ! function_exists( $location_callback ) ) {
-                        return false;
-                }
         }