Changeset 3878

Timestamp:

06/15/06 20:28:47 (3 years ago)

Author:

ryan

Message:

wp_get_archives() cleanup.

Files:

• trunk/wp-includes/deprecated.php (modified) (1 diff)
• trunk/wp-includes/general-template.php (modified) (2 diffs)

trunk/wp-includes/deprecated.php

@@ -471 +471 @@
-}
-
+function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
+    $args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
+    return wp_get_archives($args);
+}
+
-?>

trunk/wp-includes/general-template.php

@@ -276 +276 @@
-
-function wp_get_archives($args = '') {
-    parse_str($args, $r);
-    if ( !isset($r['type']) )
-        $r['type'] = '';
-    if ( !isset($r['limit']) )
-        $r['limit'] = '';
-    if ( !isset($r['format']) )
-        $r['format'] = 'html';
-    if ( !isset($r['before']) )
-        $r['before'] = '';
-    if ( !isset($r['after']) )
-        $r['after'] = '';
-    if ( !isset($r['show_post_count']) )
-        $r['show_post_count'] = false;
-
-    get_archives($r['type'], $r['limit'], $r['format'], $r['before'], $r['after'], $r['show_post_count']);
-}
-
-
-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-    global $wp_locale, $wpdb;
+
+    if ( is_array($args) )
+        $r = &$args;
+    else
+        parse_str($args, $r);
+
+    $defaults = array('type' => 'monthly', 'limit' => '', 'format' => 'html', 'before' => '', 'after' => '', 'show_post_count' => false);
+    $r = array_merge($defaults, $r);
+    extract($r);
-
-    if ( '' == $type )
@@ -304 +294 @@
-        $limit = ' LIMIT '.$limit;
-    }
+
-    // this is what will separate dates on weekly archive links
-    $archive_week_separator = '–';