diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-10 11:53:05 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-10 11:53:05 +0000 |
| commit | a35bb9df8c7816a6facf68ff963d5350999befe4 (patch) | |
| tree | 938afe326a64560dcc79f2888c6fc97f848e2eaa /wp-includes | |
| parent | b27bbc0cfea92cfbbfd34a8e2f65b026086e99b2 (diff) | |
| download | wordpress-mu-a35bb9df8c7816a6facf68ff963d5350999befe4.tar.gz wordpress-mu-a35bb9df8c7816a6facf68ff963d5350999befe4.tar.xz wordpress-mu-a35bb9df8c7816a6facf68ff963d5350999befe4.zip | |
WP Merge to rev 4714
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@839 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
| -rw-r--r-- | wp-includes/deprecated.php | 4 | ||||
| -rw-r--r-- | wp-includes/formatting.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index 38b07ca..6afe8d2 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -429,8 +429,8 @@ function wp_list_cats($args = '') { $r['show_last_update'] = $r['optiondates'];
if ( isset($r['optioncount']) )
$r['show_count'] = $r['optioncount'];
- if ( !empty($r['list']) )
- $r['style'] = 'break';
+ if ( isset($r['list']) )
+ $r['style'] = $r['list'] ? 'list' : 'break';
$r['title_li'] = '';
return wp_list_categories($r);
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index d1ec74c..26b8158 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -288,7 +288,7 @@ function remove_accents($string) { return $string; } -function sanitize_file( $name ) { // Like sanitize_title, but with periods +function sanitize_file_name( $name ) { // Like sanitize_title, but with periods $name = strtolower( $name ); $name = preg_replace('/&.+?;/', '', $name); // kill entities $name = str_replace( '_', '-', $name ); |