Ticket #7925: 7925.01.patch

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

@@ -96 +96 @@
                 } else {
                         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 );
                 }
 
                 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 );
 

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

@@ -58 +58 @@
                                         // Check to see if action is activity-specific.
                                         ( false !== strpos( $_REQUEST['action'], 'activity' ) || ( 'post_update' === $_REQUEST['action'] ) )
                                 ) {
-                                        require $this->dir . 'ajax.php';
+                                        require bp_nouveau()->activity->dir . 'ajax.php';
                                 }
                         } );
                 }

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

@@ -52 +52 @@
                 } else {
                         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';
                                 }
                         } );
                 }

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

@@ -50 +50 @@
                 } else {
                         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';
                                 }
                         } );
                 }

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

@@ -55 +55 @@
                 } else {
                         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';
                                 }
                         } );
                 }

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

@@ -53 +53 @@
                 } else {
                         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';
                                 }
                         } );
                 }