Changeset 12192

Timestamp:

07/20/2018 08:29:17 PM (16 months ago)

Author:

boonebgorges

Message:

Avoid the use of $this inside closures in Nouveau AJAX handlers.

This construction is not compatible with PHP 5.3.

Props r-a-y.
Fixes #7925.

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress-functions.php (modified) (2 diffs)
• includes/activity/loader.php (modified) (1 diff)
• includes/blogs/loader.php (modified) (1 diff)
• includes/friends/loader.php (modified) (1 diff)
• includes/groups/loader.php (modified) (1 diff)
• includes/messages/loader.php (modified) (1 diff)

trunk/src/bp-templates/bp-nouveau/buddypress-functions.php

@@ -97 +97 @@
             add_action( 'admin_init', function() {
                 if ( defined( 'DOING_AJAX' ) && true === DOING_AJAX ) {
-                    require $this->includes_dir . 'ajax.php';
+                    require bp_nouveau()->includes_dir . 'ajax.php';
                 }
             }, 0 );
@@ -104 +104 @@
         add_action( 'bp_customize_register', function() {
             if ( bp_is_root_blog() && current_user_can( 'customize' ) ) {
-                require $this->includes_dir . 'customizer.php';
+                require bp_nouveau()->includes_dir . 'customizer.php';
             }
         }, 0 );

trunk/src/bp-templates/bp-nouveau/includes/activity/loader.php

@@ -59 +59 @@
                     ( false !== strpos( $_REQUEST['action'], 'activity' ) || ( 'post_update' === $_REQUEST['action'] ) )
                 ) {
-                    require $this->dir . 'ajax.php';
+                    require bp_nouveau()->activity->dir . 'ajax.php';
                 }
             } );

trunk/src/bp-templates/bp-nouveau/includes/blogs/loader.php

@@ -53 +53 @@
             add_action( 'admin_init', function() {
                 if ( defined( 'DOING_AJAX' ) && true === DOING_AJAX && 0 === strpos( $_REQUEST['action'], 'blogs_' ) ) {
-                    require $this->dir . 'ajax.php';
+                    require bp_nouveau()->blogs->dir . 'ajax.php';
                 }
             } );

trunk/src/bp-templates/bp-nouveau/includes/friends/loader.php

@@ -51 +51 @@
             add_action( 'admin_init', function() {
                 if ( defined( 'DOING_AJAX' ) && true === DOING_AJAX && 0 === strpos( $_REQUEST['action'], 'friends_' ) ) {
-                    require $this->dir . 'ajax.php';
+                    require bp_nouveau()->friends->dir . 'ajax.php';
                 }
             } );

trunk/src/bp-templates/bp-nouveau/includes/groups/loader.php

@@ -56 +56 @@
             add_action( 'admin_init', function() {
                 if ( defined( 'DOING_AJAX' ) && true === DOING_AJAX && 0 === strpos( $_REQUEST['action'], 'groups_' ) ) {
-                    require $this->dir . 'ajax.php';
+                    require bp_nouveau()->groups->dir . 'ajax.php';
                 }
             } );

trunk/src/bp-templates/bp-nouveau/includes/messages/loader.php

@@ -54 +54 @@
             add_action( 'admin_init', function() {
                 if ( defined( 'DOING_AJAX' ) && true === DOING_AJAX && 0 === strpos( $_REQUEST['action'], 'messages_' ) ) {
-                    require $this->dir . 'ajax.php';
+                    require bp_nouveau()->messages->dir . 'ajax.php';
                 }
             } );