Changeset 191

Timestamp:

06/08/2003 12:15:39 AM (23 years ago)

Author:

mikelittle

Message:

Updated archive mode. Default is now admin setting.

File:

• trunk/b2-include/b2template.functions.php (modified) (10 diffs)

trunk/b2-include/b2template.functions.php

@@ -111 +111 @@
 }
 
-function get_archives($type, $limit='') {
+function get_archives($type='', $limit='') {
         global $tableposts, $dateformat, $time_difference, $siteurl, $blogfilename, $querystring_start, $querystring_equal, $month, $wpdb, $start_of_week;
+
+    if ('' == $type) {
+        $type = get_settings('archive_mode');
+    }
 
         if ('' != $limit) {
@@ -125 +129 @@
         $archive_link_w = $siteurl.'/'.$blogfilename.$querystring_start.'w'.$querystring_equal; # weekly archive;
         $archive_link_p = $siteurl.'/'.$blogfilename.$querystring_start.'p'.$querystring_equal; # post-by-post archive;
-        
+
     // over-ride general date format ? 0 = no: use the date format set in Options, 1 = yes: over-ride
     $archive_date_format_over_ride = 0;
@@ -145 +149 @@
         $archive_week_end_date_format   = $dateformat;
     }
-        
+
         $now = date('Y-m-d H:i:s',(time() + ($time_difference * 3600)));
-        
+
         if ('monthly' == $type) {
                 ++$querycount;
@@ -599 +603 @@
 
         if(($p) || ($posts_per_page==1)) {
-                
+
                 $current_post_date = $post->post_date;
                 $current_category = $post->post_category;
@@ -635 +639 @@
         global $querystring_start, $querystring_equal, $querystring_separator;
         if(($p) || ($posts==1)) {
-                
+
                 $current_post_date = $post->post_date;
                 $current_category = $post->post_category;
@@ -684 +688 @@
                         $qstr = preg_replace("/paged=\d{0,}/","",$qstr);
                 } elseif (stristr($HTTP_SERVER_VARS['REQUEST_URI'], $HTTP_SERVER_VARS['SCRIPT_NAME'] )) {
-                        if ('' != $qstr = str_replace($HTTP_SERVER_VARS['SCRIPT_NAME'], '', 
+                        if ('' != $qstr = str_replace($HTTP_SERVER_VARS['SCRIPT_NAME'], '',
                                                                                         $HTTP_SERVER_VARS['REQUEST_URI']) ) {
                                 $qstr = preg_replace("/^\//", "", $qstr);
-                                $qstr = preg_replace("/paged\/\d{0,}\//", "", $qstr);           
+                                $qstr = preg_replace("/paged\/\d{0,}\//", "", $qstr);
                                 $qstr = preg_replace("/paged\/\d{0,}/", "", $qstr);
                                 $qstr = preg_replace("/\/$/", "", $qstr);
@@ -734 +738 @@
                         $qstr = preg_replace("/paged=\d{0,}/","",$qstr);
                 } elseif (stristr($HTTP_SERVER_VARS['REQUEST_URI'], $HTTP_SERVER_VARS['SCRIPT_NAME'] )) {
-                        if ('' != $qstr = str_replace($HTTP_SERVER_VARS['SCRIPT_NAME'], '', 
+                        if ('' != $qstr = str_replace($HTTP_SERVER_VARS['SCRIPT_NAME'], '',
                                                                                         $HTTP_SERVER_VARS['REQUEST_URI']) ) {
                                 $qstr = preg_replace("/^\//", "", $qstr);
-                                $qstr = preg_replace("/paged\/\d{0,}\//", "", $qstr);           
+                                $qstr = preg_replace("/paged\/\d{0,}\//", "", $qstr);
                                 $qstr = preg_replace("/paged\/\d{0,}/", "", $qstr);
                                 $qstr = preg_replace("/\/$/", "", $qstr);
@@ -748 +752 @@
                         'paged'.$querystring_equal.$nextpage;
         }
-} 
+}
 
 function previous_posts_link($label='<< Previous Page') {
@@ -979 +983 @@
 
         $url = str_replace('http://url', '', $url);
-        
+
         if (empty($url) && empty($email)) return $author;
         echo '<a href="';
@@ -1194 +1198 @@
                 $id = 0;
                 $postdata = array (
-                        'ID' => 0, 
+                        'ID' => 0,
                         'Author_ID' => $HTTP_GET_VARS['preview_userid'],
                         'Date' => $HTTP_GET_VARS['preview_date'],