Changeset 12280

Timestamp:

11/07/2018 04:08:57 PM (6 years ago)

Author:

boonebgorges

Message:

Improved approach for avoiding empty() use in bp-nouveau template tags.

See #7998.

Location:

trunk/src/bp-templates/bp-nouveau/includes

Files:

• blogs/template-tags.php (modified) (1 diff)
• groups/template-tags.php (modified) (1 diff)
• members/template-tags.php (modified) (3 diffs)

trunk/src/bp-templates/bp-nouveau/includes/blogs/template-tags.php

@@ -220 +220 @@
         remove_filter( 'bp_get_blogs_visit_blog_button', 'bp_nouveau_blogs_catch_button_args', 100, 1 );
 
-        $button_args = bp_nouveau()->blogs->button_args ;
-        if ( ! empty( $button_args ) ) {
+        if ( isset( bp_nouveau()->blogs->button_args ) && bp_nouveau()->blogs->button_args ) {
+            $button_args = bp_nouveau()->blogs->button_args ;
+
             // If we pass through parent classes add them to $button array
             $parent_class = '';

trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php

@@ -946 +946 @@
             remove_filter( 'bp_get_group_join_button', 'bp_nouveau_groups_catch_button_args', 100, 1 );
 
-            $button_args = bp_nouveau()->groups->button_args;
-            if ( ! empty( $button_args ) ) {
+            if ( isset( bp_nouveau()->groups->button_args ) && bp_nouveau()->groups->button_args ) {
+                $button_args = bp_nouveau()->groups->button_args;
 
                 // If we pass through parent classes merge those into the existing ones

trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php

@@ -340 +340 @@
                 remove_filter( 'bp_get_add_friend_button', 'bp_nouveau_members_catch_button_args', 100, 1 );
 
-                $button_args = bp_nouveau()->members->button_args;
-                if ( ! empty( $button_args ) ) {
+                if ( isset( bp_nouveau()->members->button_args ) && bp_nouveau()->members->button_args ) {
+                    $button_args = bp_nouveau()->members->button_args;
 
                     $buttons['member_friendship'] = array(
@@ -393 +393 @@
                 remove_filter( 'bp_get_send_public_message_button', 'bp_nouveau_members_catch_button_args', 100, 1 );
 
-                $button_args = bp_nouveau()->members->button_args;
-                if ( ! empty( $button_args ) ) {
+                if ( isset( bp_nouveau()->members->button_args ) && bp_nouveau()->members->button_args ) {
+                    $button_args = bp_nouveau()->members->button_args;
+
                     /*
                      * This button should remain as an anchor link.
@@ -435 +436 @@
                 remove_filter( 'bp_get_send_message_button_args', 'bp_nouveau_members_catch_button_args', 100, 1 );
 
-                $button_args = bp_nouveau()->members->button_args;
-                if ( ! empty( $button_args ) ) {
+                if ( isset( bp_nouveau()->members->button_args ) && bp_nouveau()->members->button_args ) {
+                    $button_args = bp_nouveau()->members->button_args;
+
                     /*
                      * This button should remain as an anchor link.