Changeset 7333

Timestamp:

08/01/2013 12:06:38 AM (13 years ago)

Author:

boonebgorges

Message:

Define BP_Group_Extension screen callbacks non-statically

These callbacks should not be defined statically, because then the $this
keyword is not available in the callbacks. This causes backward compatibility
issues, especially with PHP 5.2.x, where it results in fatal errors.

Fixes #5126

Location:

branches/1.8

Files:

• bp-groups/bp-groups-classes.php (modified) (2 diffs)
• tests/testcases/groups/class-bp-group-extension.php (modified) (3 diffs)

branches/1.8/bp-groups/bp-groups-classes.php

@@ -2581 +2581 @@
                 $rmethod = $this->class_reflection->getMethod( $method );
                 if ( isset( $rmethod->class ) && $this->class_name === $rmethod->class ) {
-                        $callback = array( $this->class_name, $method );
+                        $callback = array( $this, $method );
                 }
 
@@ -2588 +2588 @@
                         $rfallback_method = $this->class_reflection->getMethod( $fallback_method );
                         if ( isset( $rfallback_method->class ) && $this->class_name === $rfallback_method->class ) {
-                                $callback = array( $this->class_name, $fallback_method );
+                                $callback = array( $this, $fallback_method );
                         }
                 }

branches/1.8/tests/testcases/groups/class-bp-group-extension.php

@@ -62 +62 @@
 
                 $fallback = array(
-                        'screen_callback' => array( $class_name, 'settings_screen' ),
-                        'screen_save_callback' => array( $class_name, 'settings_screen_save' ),
+                        'screen_callback' => array( $e, 'settings_screen' ),
+                        'screen_save_callback' => array( $e, 'settings_screen_save' ),
                 );
                 $fallbacks = array(
@@ -91 +91 @@
 
                 $fallback = array(
-                        'screen_callback' => array( $class_name, 'settings_screen' ),
-                        'screen_save_callback' => array( $class_name, 'settings_screen_save' ),
+                        'screen_callback' => array( $e, 'settings_screen' ),
+                        'screen_save_callback' => array( $e, 'settings_screen_save' ),
                 );
                 $expected = array(
                         'create' => $fallback,
                         'edit' => array(
-                                'screen_callback' => array( $class_name, 'edit_screen' ),
-                                'screen_save_callback' => array( $class_name, 'edit_screen_save' ),
+                                'screen_callback' => array( $e, 'edit_screen' ),
+                                'screen_save_callback' => array( $e, 'edit_screen_save' ),
                         ),
                         'admin' => $fallback,
@@ -203 +203 @@
                 $e->_register();
 
-                $this->assertEquals( array( $class_name, 'settings_screen' ), $e->screens['create']['screen_callback'] );
-                $this->assertEquals( array( $class_name, 'settings_screen_save' ), $e->screens['create']['screen_save_callback'] );
-                $this->assertEquals( array( $class_name, 'settings_screen' ), $e->screens['admin']['screen_callback'] );
-                $this->assertEquals( array( $class_name, 'settings_screen_save' ), $e->screens['admin']['screen_save_callback'] );
-                $this->assertEquals( array( $class_name, 'edit_screen' ), $e->screens['edit']['screen_callback'] );
-                $this->assertEquals( array( $class_name, 'edit_screen_save' ), $e->screens['edit']['screen_save_callback'] );
+                $this->assertEquals( array( $e, 'settings_screen' ), $e->screens['create']['screen_callback'] );
+                $this->assertEquals( array( $e, 'settings_screen_save' ), $e->screens['create']['screen_save_callback'] );
+                $this->assertEquals( array( $e, 'settings_screen' ), $e->screens['admin']['screen_callback'] );
+                $this->assertEquals( array( $e, 'settings_screen_save' ), $e->screens['admin']['screen_save_callback'] );
+                $this->assertEquals( array( $e, 'edit_screen' ), $e->screens['edit']['screen_callback'] );
+                $this->assertEquals( array( $e, 'edit_screen_save' ), $e->screens['edit']['screen_save_callback'] );
         }