From 296671abcc24ab170dce999359e20a38fb60a9e7 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 13 Oct 2015 17:02:25 +0000
Subject: [PATCH] Taxonomy: in `wp_list_categories()`, add an arg: `separator`,
 to allow the overriding of `<br/>`.

Props wojtek.szkutnik.
Fixes #9025.

Built from https://develop.svn.wordpress.org/trunk@35140


git-svn-id: http://core.svn.wordpress.org/trunk@35105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/category-template.php     | 3 ++-
 wp-includes/class-walker-category.php | 2 ++
 wp-includes/version.php               | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 9e81ef2474..471def6c17 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -474,7 +474,7 @@ function wp_dropdown_categories( $args = '' ) {
  * Display or retrieve the HTML list of categories.
  *
  * @since 2.1.0
- * @since 4.4.0 Introduced the `hide_title_if_empty` argument. The `current_category` argument was modified to
+ * @since 4.4.0 Introduced the `hide_title_if_empty` and `separator` arguments. The `current_category` argument was modified to
  *              optionally accept an array of values.
  *
  * @param string|array $args {
@@ -530,6 +530,7 @@ function wp_list_categories( $args = '' ) {
 		'hierarchical' => true, 'title_li' => __( 'Categories' ),
 		'hide_title_if_empty' => false,
 		'echo' => 1, 'depth' => 0,
+		'separator' => '<br />',
 		'taxonomy' => 'category'
 	);
 
diff --git a/wp-includes/class-walker-category.php b/wp-includes/class-walker-category.php
index 3bd12054cf..da518c9ee1 100644
--- a/wp-includes/class-walker-category.php
+++ b/wp-includes/class-walker-category.php
@@ -189,6 +189,8 @@ class Walker_Category extends Walker {
 
 			$output .=  ' class="' . $css_classes . '"';
 			$output .= ">$link\n";
+		} elseif ( isset( $args['separator'] ) ) {
+			$output .= "\t$link" . $args['separator'] . "\n";
 		} else {
 			$output .= "\t$link<br />\n";
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6d20a094dd..f0f726177b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35139';
+$wp_version = '4.4-alpha-35140';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.