Changeset 1186

Timestamp:

04/27/2004 03:59:13 AM (20 years ago)

Author:

rboren

Message:

Unify user and author queries on cache_userdata

Location:

trunk

Files:

• wp-blog-header.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/template-functions-author.php (modified) (3 diffs)

trunk/wp-blog-header.php

@@ -271 +271 @@
 }
 
-// author stuff
-foreach ($users as $auteur) {
-    $cache_authors[$auteur->ID] = $auteur;
+// Author/user stuff
+$users = $wpdb->get_results("SELECT * FROM $tableusers WHERE 1=1");
+foreach ($users as $user) {
+    $cache_userdata[$user->ID] = $user;
 }
 

trunk/wp-includes/functions.php

@@ -176 +176 @@
 
 function get_userdata($userid) {
-    global $wpdb, $cache_authors, $tableusers;
-    if ( empty($cache_authors[$userid]) ) {
+    global $wpdb, $cache_userdata, $tableusers;
+    if ( empty($cache_userdata[$userid]) ) {
         $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE ID = '$userid'");
         $user->user_nickname = stripslashes($user->user_nickname);
@@ -1096 +1096 @@
     }
     $authordata = get_userdata($post->post_author);
+
     $day = mysql2date('d.m.y', $post->post_date);
     $currentmonth = mysql2date('m', $post->post_date);

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

@@ -6 +6 @@
         $idmode = $authordata->user_idmode;
     }
+
     if ($idmode == 'nickname')    $id = $authordata->user_nickname;
     if ($idmode == 'login')    $id = $authordata->user_login;
@@ -77 +78 @@
 
 function get_author_link($echo = false, $author_id, $author_nicename) {
-    global $wpdb, $tableusers, $post, $querystring_start, $querystring_equal, $cache_authors;
+    global $wpdb, $tableusers, $post, $querystring_start, $querystring_equal, $cache_userdata;
     $auth_ID = $author_id;
     $permalink_structure = get_settings('permalink_structure');
@@ -85 +86 @@
         $link = $file.$querystring_start.'author'.$querystring_equal.$auth_ID;
     } else {
-        if ('' == $author_nicename) $author_nicename = $cache_authors[$author_id]->author_nicename;
+        if ('' == $author_nicename) $author_nicename = $cache_userdata[$author_id]->author_nicename;
         // Get any static stuff from the front
         $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));