← Back to branch summary

~canonical-sysadmins/wordpress/4.8.3

« back to all changes in this revision

Viewing changes to wp-includes/bookmark-template.php

  • Committer: Ryan Finnie
  • Date: 2015-08-31 16:09:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: ryan.finnie@canonical.com-20150831160947-1h6rfxby9z1ec62u
Merge WP4.3 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/bookmark-template.php
195
195
 *                                      $categorize is true. Accepts 'ASC' (ascending) or 'DESC' (descending).
196
196
 *                                      Default 'ASC'.
197
197
 * }
198
 
 * @return string|null Will only return if echo option is set to not echo. Default is not return anything.
 
198
 * @return string|void Will only return if echo option is set to not echo. Default is not return anything.
199
199
 */
200
200
function wp_list_bookmarks( $args = '' ) {
201
201
        $defaults = array(
214
214
 
215
215
        $output = '';
216
216
 
 
217
        if ( ! is_array( $r['class'] ) ) {
 
218
                $r['class'] = explode( ' ', $r['class'] );
 
219
        }
 
220
        $r['class'] = array_map( 'sanitize_html_class', $r['class'] );
 
221
        $r['class'] = trim( join( ' ', $r['class'] ) );
 
222
 
217
223
        if ( $r['categorize'] ) {
218
224
                $cats = get_terms( 'link_category', array(
219
225
                        'name__like' => $r['category_name'],