Changeset 45667 for trunk/src/wp-includes/bookmark-template.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-template.php (modified) (12 diffs)

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

@@ -63 +63 @@
     );
 
-    $r = wp_parse_args( $args, $defaults );
+    $parsed_args = wp_parse_args( $args, $defaults );
 
     $output = ''; // Blank string to start with.
@@ -71 +71 @@
             $bookmark->recently_updated = false;
         }
-        $output .= $r['before'];
-        if ( $r['show_updated'] && $bookmark->recently_updated ) {
+        $output .= $parsed_args['before'];
+        if ( $parsed_args['show_updated'] && $bookmark->recently_updated ) {
             $output .= '<em>';
         }
@@ -83 +83 @@
         $title = $desc;
 
-        if ( $r['show_updated'] ) {
+        if ( $parsed_args['show_updated'] ) {
             if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) {
                 $title .= ' (';
@@ -96 +96 @@
             }
         }
-        $alt = ' alt="' . $name . ( $r['show_description'] ? ' ' . $title : '' ) . '"';
+        $alt = ' alt="' . $name . ( $parsed_args['show_description'] ? ' ' . $title : '' ) . '"';
 
         if ( '' != $title ) {
@@ -111 +111 @@
         $output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
 
-        $output .= $r['link_before'];
-
-        if ( $bookmark->link_image != null && $r['show_images'] ) {
+        $output .= $parsed_args['link_before'];
+
+        if ( $bookmark->link_image != null && $parsed_args['show_images'] ) {
             if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
                 $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
@@ -119 +119 @@
                 $output .= '<img src="' . get_option( 'siteurl' ) . "$bookmark->link_image\" $alt $title />";
             }
-            if ( $r['show_name'] ) {
+            if ( $parsed_args['show_name'] ) {
                 $output .= " $name";
             }
@@ -126 +126 @@
         }
 
-        $output .= $r['link_after'];
+        $output .= $parsed_args['link_after'];
 
         $output .= '</a>';
 
-        if ( $r['show_updated'] && $bookmark->recently_updated ) {
+        if ( $parsed_args['show_updated'] && $bookmark->recently_updated ) {
             $output .= '</em>';
         }
 
-        if ( $r['show_description'] && '' != $desc ) {
-            $output .= $r['between'] . $desc;
-        }
-
-        if ( $r['show_rating'] ) {
-            $output .= $r['between'] . sanitize_bookmark_field(
+        if ( $parsed_args['show_description'] && '' != $desc ) {
+            $output .= $parsed_args['between'] . $desc;
+        }
+
+        if ( $parsed_args['show_rating'] ) {
+            $output .= $parsed_args['between'] . sanitize_bookmark_field(
                 'link_rating',
                 $bookmark->link_rating,
@@ -146 +146 @@
             );
         }
-        $output .= $r['after'] . "\n";
+        $output .= $parsed_args['after'] . "\n";
     } // end while
 
@@ -226 +226 @@
     );
 
-    $r = wp_parse_args( $args, $defaults );
+    $parsed_args = wp_parse_args( $args, $defaults );
 
     $output = '';
 
-    if ( ! is_array( $r['class'] ) ) {
-        $r['class'] = explode( ' ', $r['class'] );
+    if ( ! is_array( $parsed_args['class'] ) ) {
+        $parsed_args['class'] = explode( ' ', $parsed_args['class'] );
     }
-    $r['class'] = array_map( 'sanitize_html_class', $r['class'] );
-    $r['class'] = trim( join( ' ', $r['class'] ) );
-
-    if ( $r['categorize'] ) {
+    $parsed_args['class'] = array_map( 'sanitize_html_class', $parsed_args['class'] );
+    $parsed_args['class'] = trim( join( ' ', $parsed_args['class'] ) );
+
+    if ( $parsed_args['categorize'] ) {
         $cats = get_terms(
             'link_category',
             array(
-                'name__like'   => $r['category_name'],
-                'include'      => $r['category'],
-                'exclude'      => $r['exclude_category'],
-                'orderby'      => $r['category_orderby'],
-                'order'        => $r['category_order'],
+                'name__like'   => $parsed_args['category_name'],
+                'include'      => $parsed_args['category'],
+                'exclude'      => $parsed_args['exclude_category'],
+                'orderby'      => $parsed_args['category_orderby'],
+                'order'        => $parsed_args['category_order'],
                 'hierarchical' => 0,
             )
         );
         if ( empty( $cats ) ) {
-            $r['categorize'] = false;
+            $parsed_args['categorize'] = false;
         }
     }
 
-    if ( $r['categorize'] ) {
+    if ( $parsed_args['categorize'] ) {
         // Split the bookmarks into ul's for each category
         foreach ( (array) $cats as $cat ) {
-            $params    = array_merge( $r, array( 'category' => $cat->term_id ) );
+            $params    = array_merge( $parsed_args, array( 'category' => $cat->term_id ) );
             $bookmarks = get_bookmarks( $params );
             if ( empty( $bookmarks ) ) {
@@ -263 +263 @@
             $output .= str_replace(
                 array( '%id', '%class' ),
-                array( "linkcat-$cat->term_id", $r['class'] ),
-                $r['category_before']
+                array( "linkcat-$cat->term_id", $parsed_args['class'] ),
+                $parsed_args['category_before']
             );
             /**
@@ -275 +275 @@
             $catname = apply_filters( 'link_category', $cat->name );
 
-            $output .= $r['title_before'];
+            $output .= $parsed_args['title_before'];
             $output .= $catname;
-            $output .= $r['title_after'];
+            $output .= $parsed_args['title_after'];
             $output .= "\n\t<ul class='xoxo blogroll'>\n";
-            $output .= _walk_bookmarks( $bookmarks, $r );
+            $output .= _walk_bookmarks( $bookmarks, $parsed_args );
             $output .= "\n\t</ul>\n";
-            $output .= $r['category_after'] . "\n";
+            $output .= $parsed_args['category_after'] . "\n";
         }
     } else {
         //output one single list using title_li for the title
-        $bookmarks = get_bookmarks( $r );
+        $bookmarks = get_bookmarks( $parsed_args );
 
         if ( ! empty( $bookmarks ) ) {
-            if ( ! empty( $r['title_li'] ) ) {
+            if ( ! empty( $parsed_args['title_li'] ) ) {
                 $output .= str_replace(
                     array( '%id', '%class' ),
-                    array( 'linkcat-' . $r['category'], $r['class'] ),
-                    $r['category_before']
+                    array( 'linkcat-' . $parsed_args['category'], $parsed_args['class'] ),
+                    $parsed_args['category_before']
                 );
-                $output .= $r['title_before'];
-                $output .= $r['title_li'];
-                $output .= $r['title_after'];
+                $output .= $parsed_args['title_before'];
+                $output .= $parsed_args['title_li'];
+                $output .= $parsed_args['title_after'];
                 $output .= "\n\t<ul class='xoxo blogroll'>\n";
-                $output .= _walk_bookmarks( $bookmarks, $r );
+                $output .= _walk_bookmarks( $bookmarks, $parsed_args );
                 $output .= "\n\t</ul>\n";
-                $output .= $r['category_after'] . "\n";
+                $output .= $parsed_args['category_after'] . "\n";
             } else {
-                $output .= _walk_bookmarks( $bookmarks, $r );
+                $output .= _walk_bookmarks( $bookmarks, $parsed_args );
             }
         }
@@ -316 +316 @@
     $html = apply_filters( 'wp_list_bookmarks', $output );
 
-    if ( ! $r['echo'] ) {
+    if ( ! $parsed_args['echo'] ) {
         return $html;
     }