Changeset 45590 for trunk/src/wp-includes/bookmark.php

Timestamp:

07/02/2019 11:41:16 PM (7 years ago)

Author:

pento

Message:

Coding Standards: Fix the Squiz.PHP.DisallowMultipleAssignments violations in wp-includes.

See #47632.

File:

• trunk/src/wp-includes/bookmark.php (modified) (3 diffs)

trunk/src/wp-includes/bookmark.php

@@ -35 +35 @@
                 if ( isset( $GLOBALS['link'] ) && ( $GLOBALS['link']->link_id == $bookmark ) ) {
                         $_bookmark = & $GLOBALS['link'];
-                } elseif ( ! $_bookmark = wp_cache_get( $bookmark, 'bookmark' ) ) {
-                        $_bookmark = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark ) );
-                        if ( $_bookmark ) {
-                                $_bookmark->link_category = array_unique( wp_get_object_terms( $_bookmark->link_id, 'link_category', array( 'fields' => 'ids' ) ) );
-                                wp_cache_add( $_bookmark->link_id, $_bookmark, 'bookmark' );
+                } else {
+                        $_bookmark = wp_cache_get( $bookmark, 'bookmark' );
+                        if ( ! $_bookmark ) {
+                                $_bookmark = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark ) );
+                                if ( $_bookmark ) {
+                                        $_bookmark->link_category = array_unique( wp_get_object_terms( $_bookmark->link_id, 'link_category', array( 'fields' => 'ids' ) ) );
+                                        wp_cache_add( $_bookmark->link_id, $_bookmark, 'bookmark' );
+                                }
                         }
                 }
@@ -140 +143 @@
 
         $key   = md5( serialize( $r ) );
-        $cache = false;
-        if ( 'rand' !== $r['orderby'] && $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
+        $cache = wp_cache_get( 'get_bookmarks', 'bookmark' );
+        if ( 'rand' !== $r['orderby'] && $cache ) {
                 if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
                         $bookmarks = $cache[ $key ];
@@ -205 +208 @@
 
         if ( ! empty( $r['category_name'] ) ) {
-                if ( $r['category'] = get_term_by( 'name', $r['category_name'], 'link_category' ) ) {
+                $r['category'] = get_term_by( 'name', $r['category_name'], 'link_category' );
+                if ( $r['category'] ) {
                         $r['category'] = $r['category']->term_id;
                 } else {