From 2d1e9126cb10f52e7711ce121f8bdaa5bdc71aa4 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 16 Sep 2001 11:33:14 +0000
Subject: - Added the new user module!

---
 includes/node.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'includes/node.inc')

diff --git a/includes/node.inc b/includes/node.inc
index 70a0472af..918678035 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -16,7 +16,7 @@ function _node_get($conditions) {
   }
 
   if ($type) {
-    return db_query("SELECT n.*, l.*, u.name FROM node n LEFT JOIN $type l ON n.lid = l.lid AND n.nid = l.nid LEFT JOIN users u ON n.author = u.id WHERE $where ORDER BY n.timestamp DESC");
+    return db_query("SELECT n.*, l.*, u.uid, u.name FROM node n LEFT JOIN $type l ON n.lid = l.lid AND n.nid = l.nid LEFT JOIN user u ON n.author = u.uid WHERE $where ORDER BY n.timestamp DESC");
   }
 }
 
@@ -190,7 +190,7 @@ function node_control($node) {
   </SCRIPT>
  <?php
 
-  if ($user->id) {
+  if ($user->uid) {
     $choices = array("node.php?id=$node->nid" => t("view node"), "submit.php?mod=$node->type" => t("add node"), "submit.php?mod=$node->type&op=update&id=$node->nid" => t("update node"),  "node.php?op=history&id=$node->nid" => t("view history"));
   }
   else {
@@ -236,7 +236,7 @@ function node_index($node) {
 
 function node_access($node) {
   global $user, $status;
-  return ($node->status == $status[posted]) || ($node->status == $status[queued] && $user->id) || user_access("administer nodes");
+  return ($node->status == $status[posted]) || ($node->status == $status[queued] && $user->uid) || user_access("administer nodes");
 }
 
 
-- 
cgit v1.2.3