Changeset 9379

Timestamp:

01/19/2015 08:56:38 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Move variable assignments inside conditional statements in bp-activity-classes.php. See #5891.

File:

• trunk/src/bp-activity/bp-activity-classes.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-classes.php

@@ -935 +935 @@
 
             $query = new BP_Activity_Query( $query_args );
-            if ( $sql = $query->get_sql() ) {
+            $sql   = $query->get_sql();
+            if ( ! empty( $sql ) ) {
                 $retval['sql'] = $sql;
             }
@@ -2277 +2278 @@
 
             // Strip suffixes from ETag if they exist (eg. "-gzip")
-            if ( $etag_suffix_pos = strpos( $client_etag, '-' ) ) {
+            $etag_suffix_pos = strpos( $client_etag, '-' );
+            if ( ! empty( $etag_suffix_pos ) ) {
                 $client_etag = substr( $client_etag, 0, $etag_suffix_pos );
             }