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

Timestamp:

07/25/2019 12:47:53 AM (5 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-admin/includes/bookmark.php (modified) (2 diffs)

trunk/src/wp-admin/includes/bookmark.php

@@ -163 +163 @@
     );
 
-    $args = wp_parse_args( $linkdata, $defaults );
-    $r    = wp_unslash( sanitize_bookmark( $args, 'db' ) );
-
-    $link_id   = $r['link_id'];
-    $link_name = $r['link_name'];
-    $link_url  = $r['link_url'];
+    $parsed_args = wp_parse_args( $linkdata, $defaults );
+    $parsed_args = wp_unslash( sanitize_bookmark( $parsed_args, 'db' ) );
+
+    $link_id   = $parsed_args['link_id'];
+    $link_name = $parsed_args['link_name'];
+    $link_url  = $parsed_args['link_url'];
 
     $update = false;
@@ -187 +187 @@
     }
 
-    $link_rating      = ( ! empty( $r['link_rating'] ) ) ? $r['link_rating'] : 0;
-    $link_image       = ( ! empty( $r['link_image'] ) ) ? $r['link_image'] : '';
-    $link_target      = ( ! empty( $r['link_target'] ) ) ? $r['link_target'] : '';
-    $link_visible     = ( ! empty( $r['link_visible'] ) ) ? $r['link_visible'] : 'Y';
-    $link_owner       = ( ! empty( $r['link_owner'] ) ) ? $r['link_owner'] : get_current_user_id();
-    $link_notes       = ( ! empty( $r['link_notes'] ) ) ? $r['link_notes'] : '';
-    $link_description = ( ! empty( $r['link_description'] ) ) ? $r['link_description'] : '';
-    $link_rss         = ( ! empty( $r['link_rss'] ) ) ? $r['link_rss'] : '';
-    $link_rel         = ( ! empty( $r['link_rel'] ) ) ? $r['link_rel'] : '';
-    $link_category    = ( ! empty( $r['link_category'] ) ) ? $r['link_category'] : array();
+    $link_rating      = ( ! empty( $parsed_args['link_rating'] ) ) ? $parsed_args['link_rating'] : 0;
+    $link_image       = ( ! empty( $parsed_args['link_image'] ) ) ? $parsed_args['link_image'] : '';
+    $link_target      = ( ! empty( $parsed_args['link_target'] ) ) ? $parsed_args['link_target'] : '';
+    $link_visible     = ( ! empty( $parsed_args['link_visible'] ) ) ? $parsed_args['link_visible'] : 'Y';
+    $link_owner       = ( ! empty( $parsed_args['link_owner'] ) ) ? $parsed_args['link_owner'] : get_current_user_id();
+    $link_notes       = ( ! empty( $parsed_args['link_notes'] ) ) ? $parsed_args['link_notes'] : '';
+    $link_description = ( ! empty( $parsed_args['link_description'] ) ) ? $parsed_args['link_description'] : '';
+    $link_rss         = ( ! empty( $parsed_args['link_rss'] ) ) ? $parsed_args['link_rss'] : '';
+    $link_rel         = ( ! empty( $parsed_args['link_rel'] ) ) ? $parsed_args['link_rel'] : '';
+    $link_category    = ( ! empty( $parsed_args['link_category'] ) ) ? $parsed_args['link_category'] : array();
 
     // Make sure we set a valid category.