Changeset 7171

Timestamp:

06/06/2013 11:13:00 PM (11 years ago)

Author:

boonebgorges

Message:

Use is_callable() to validate screen_function callbacks before hooking in bp-core-buddybar.php

We were previously using is_object() and other custom verification techniques
to hook screen functions in bp_core_new_nav_item() and elsewhere. These
techniques are limited in that they allow certain sorts of uncallable strings
to pass through. We also should not be reinventing the wheel.

Fixes #4794

Props r-a-y

File:

• trunk/bp-core/bp-core-buddybar.php (modified) (6 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -82 +82 @@
             unset( $bp->canonical_stack['action'] );
         } elseif ( ! bp_current_action() ) {
-            $func = is_object( $screen_function[0] ) ? array( &$screen_function[0], $screen_function[1] ) : $screen_function;
-            add_action( 'bp_screens', $func, 3 );
+
+            // Add our screen hook if screen function is callable
+            if ( is_callable( $screen_function ) ) {
+                add_action( 'bp_screens', $screen_function, 3 );
+            }
 
             if ( !empty( $default_subnav_slug ) ) {
@@ -113 +116 @@
 
     if ( $function = $bp->bp_nav[$parent_slug]['screen_function'] ) {
-        if ( is_object( $function[0] ) ) {
-            remove_action( 'bp_screens', array( &$function[0], $function[1] ), 3 );
-        } else {
+        // Remove our screen hook if screen function is callable
+        if ( is_callable( $function ) ) {
             remove_action( 'bp_screens', $function, 3 );
         }
@@ -137 +139 @@
         if ( empty( $unfiltered_action ) ) {
             if ( !bp_is_current_action( $subnav_slug ) ) {
-                if ( is_object( $screen_function[0] ) ) {
-                    add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ), 3 );
-                } else {
+                if ( is_callable( $screen_function ) ) {
                     add_action( 'bp_screens', $screen_function, 3 );
                 }
@@ -279 +279 @@
         // Before hooking the screen function, check user access
         if ( !empty( $user_has_access ) ) {
-            if ( is_object( $screen_function[0] ) ) {
-                add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ), 3 );
-            } else {
+            // Add our screen hook if screen function is callable
+            if ( is_callable( $screen_function ) ) {
                 add_action( 'bp_screens', $screen_function, 3 );
             }
@@ -391 +390 @@
 
     if ( $function = $bp->bp_nav[$parent_id]['screen_function'] ) {
-        if ( is_object( $function[0] ) ) {
-            remove_action( 'bp_screens', array( &$function[0], $function[1] ), 3 );
-        } else {
+        // Remove our screen hook if screen function is callable
+        if ( is_callable( $function ) ) {
             remove_action( 'bp_screens', $function, 3 );
         }
@@ -413 +411 @@
     $screen_function = isset( $bp->bp_options_nav[$parent_id][$slug]['screen_function'] ) ? $bp->bp_options_nav[$parent_id][$slug]['screen_function'] : false;
 
-    if ( !empty( $screen_function ) ) {
-        if ( is_object( $screen_function[0] ) ) {
-            remove_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ), 3 );
-        } else {
+    if ( ! empty( $screen_function ) ) {
+        // Remove our screen hook if screen function is callable
+        if ( is_callable( $screen_function ) ) {
             remove_action( 'bp_screens', $screen_function, 3 );
         }