Changeset 956 for trunk/wp-includes/template-functions-general.php

Timestamp:

03/01/2004 06:13:32 AM (21 years ago)

Author:

saxmatt

Message:

Migration to get_settings

File:

• trunk/wp-includes/template-functions-general.php (modified) (5 diffs)

trunk/wp-includes/template-functions-general.php

@@ -23 +23 @@
 
 function get_bloginfo($show='') {
-    global $blogname, $admin_email;
+    global $admin_email;
 
     $do_perma = 0;
@@ -80 +80 @@
         case 'name':
         default:
-            $output = $blogname;
+            $output = get_settings('blogname');
             break;
     }
@@ -206 +206 @@
 function get_archives($type='', $limit='', $format='html', $before = "", $after = "", $show_post_count = false) {
     global $tableposts, $time_difference;
-    global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb, $start_of_week;
+    global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb;
 
     if ('' == $type) {
@@ -271 +271 @@
         }
     } elseif ('weekly' == $type) {
-        if (!isset($start_of_week)) {
-            $start_of_week = 1;
-        }
+    $start_of_week = get_settings('start_of_week');
         $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK($wp_posts_post_date_field, $start_of_week) AS `week`, YEAR($wp_posts_post_date_field) AS yr, DATE_FORMAT($wp_posts_post_date_field, '%Y-%m-%d') AS yyyymmdd FROM $tableposts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit);
         $arc_w_last = '';
@@ -281 +279 @@
                     $arc_year = $arcresult->yr;
                     $arc_w_last = $arcresult->week;
-                    $arc_week = get_weekstartend($arcresult->yyyymmdd, $start_of_week);
+                    $arc_week = get_weekstartend($arcresult->yyyymmdd, get_settings('start_of_week'));
                     $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
                     $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);