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

Timestamp:

07/25/2019 12:47:53 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Rename $r variable used with wp_parse_args() to $parsed_args for clarity.

Props freewebmentor.
Fixes #45059.

File:

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

trunk/src/wp-includes/bookmark.php

@@ -140 +140 @@
     );
 
-    $r = wp_parse_args( $args, $defaults );
-
-    $key   = md5( serialize( $r ) );
+    $parsed_args = wp_parse_args( $args, $defaults );
+
+    $key   = md5( serialize( $parsed_args ) );
     $cache = wp_cache_get( 'get_bookmarks', 'bookmark' );
-    if ( 'rand' !== $r['orderby'] && $cache ) {
+
+    if ( 'rand' !== $parsed_args['orderby'] && $cache ) {
         if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
             $bookmarks = $cache[ $key ];
@@ -160 +161 @@
              *
              * @param array $bookmarks List of the cached bookmarks.
-             * @param array $r         An array of bookmark query arguments.
+             * @param array $parsed_args         An array of bookmark query arguments.
              */
-            return apply_filters( 'get_bookmarks', $bookmarks, $r );
+            return apply_filters( 'get_bookmarks', $bookmarks, $parsed_args );
         }
     }
@@ -171 +172 @@
 
     $inclusions = '';
-    if ( ! empty( $r['include'] ) ) {
-        $r['exclude']       = '';  //ignore exclude, category, and category_name params if using include
-        $r['category']      = '';
-        $r['category_name'] = '';
-        $inclinks           = wp_parse_id_list( $r['include'] );
+    if ( ! empty( $parsed_args['include'] ) ) {
+        $parsed_args['exclude']       = '';  //ignore exclude, category, and category_name params if using include
+        $parsed_args['category']      = '';
+        $parsed_args['category_name'] = '';
+
+        $inclinks = wp_parse_id_list( $parsed_args['include'] );
         if ( count( $inclinks ) ) {
             foreach ( $inclinks as $inclink ) {
@@ -191 +193 @@
 
     $exclusions = '';
-    if ( ! empty( $r['exclude'] ) ) {
-        $exlinks = wp_parse_id_list( $r['exclude'] );
+    if ( ! empty( $parsed_args['exclude'] ) ) {
+        $exlinks = wp_parse_id_list( $parsed_args['exclude'] );
         if ( count( $exlinks ) ) {
             foreach ( $exlinks as $exlink ) {
@@ -207 +209 @@
     }
 
-    if ( ! empty( $r['category_name'] ) ) {
-        $r['category'] = get_term_by( 'name', $r['category_name'], 'link_category' );
-        if ( $r['category'] ) {
-            $r['category'] = $r['category']->term_id;
+    if ( ! empty( $parsed_args['category_name'] ) ) {
+        $parsed_args['category'] = get_term_by( 'name', $parsed_args['category_name'], 'link_category' );
+        if ( $parsed_args['category'] ) {
+            $parsed_args['category'] = $parsed_args['category']->term_id;
         } else {
             $cache[ $key ] = array();
             wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
             /** This filter is documented in wp-includes/bookmark.php */
-            return apply_filters( 'get_bookmarks', array(), $r );
+            return apply_filters( 'get_bookmarks', array(), $parsed_args );
         }
     }
 
     $search = '';
-    if ( ! empty( $r['search'] ) ) {
-        $like   = '%' . $wpdb->esc_like( $r['search'] ) . '%';
+    if ( ! empty( $parsed_args['search'] ) ) {
+        $like   = '%' . $wpdb->esc_like( $parsed_args['search'] ) . '%';
         $search = $wpdb->prepare( ' AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ', $like, $like, $like );
     }
@@ -227 +229 @@
     $category_query = '';
     $join           = '';
-    if ( ! empty( $r['category'] ) ) {
-        $incategories = wp_parse_id_list( $r['category'] );
+    if ( ! empty( $parsed_args['category'] ) ) {
+        $incategories = wp_parse_id_list( $parsed_args['category'] );
         if ( count( $incategories ) ) {
             foreach ( $incategories as $incat ) {
@@ -244 +246 @@
     }
 
-    if ( $r['show_updated'] ) {
+    if ( $parsed_args['show_updated'] ) {
         $recently_updated_test = ', IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ';
     } else {
@@ -250 +252 @@
     }
 
-    $get_updated = ( $r['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
-
-    $orderby = strtolower( $r['orderby'] );
+    $get_updated = ( $parsed_args['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
+
+    $orderby = strtolower( $parsed_args['orderby'] );
     $length  = '';
     switch ( $orderby ) {
@@ -283 +285 @@
     }
 
-    $order = strtoupper( $r['order'] );
+    $order = strtoupper( $parsed_args['order'] );
     if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
         $order = 'ASC';
@@ -289 +291 @@
 
     $visible = '';
-    if ( $r['hide_invisible'] ) {
+    if ( $parsed_args['hide_invisible'] ) {
         $visible = "AND link_visible = 'Y'";
     }
@@ -296 +298 @@
     $query .= " $exclusions $inclusions $search";
     $query .= " ORDER BY $orderby $order";
-    if ( $r['limit'] != -1 ) {
-        $query .= ' LIMIT ' . $r['limit'];
+    if ( $parsed_args['limit'] != -1 ) {
+        $query .= ' LIMIT ' . $parsed_args['limit'];
     }
 
@@ -308 +310 @@
 
     /** This filter is documented in wp-includes/bookmark.php */
-    return apply_filters( 'get_bookmarks', $results, $r );
+    return apply_filters( 'get_bookmarks', $results, $parsed_args );
 }