From 2d1e9126cb10f52e7711ce121f8bdaa5bdc71aa4 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 16 Sep 2001 11:33:14 +0000 Subject: - Added the new user module! --- node.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'node.php') diff --git a/node.php b/node.php index 89f1cc0a7..bb195ce2f 100644 --- a/node.php +++ b/node.php @@ -77,7 +77,7 @@ function node_failure() { function node_history($node) { global $status; if ($node->status == $status[expired] || $node->status == $status[posted]) { - $output .= "
". format_date($node->timestamp) ." by ". format_name($node->name) .":
". check_output($node->log, 1) ."

"; + $output .= "
". format_date($node->timestamp) ." by ". format_name($node) .":
". check_output($node->log, 1) ."

"; } if ($node->pid) { $output .= node_history(node_get_object(array("nid" => $node->pid))); @@ -88,11 +88,11 @@ function node_history($node) { $number = ($title ? db_result(db_query("SELECT COUNT(nid) FROM node WHERE title = '$title' AND status = $status[posted]")) : 1); if ($number > 1) { - $result = db_query("SELECT n.*, u.name FROM node n LEFT JOIN users u ON n.author = u.id WHERE n.title = '$title'"); + $result = db_query("SELECT n.*, u.name, u.uid FROM node n LEFT JOIN user u ON n.author = u.uid WHERE n.title = '$title'"); while ($node = db_fetch_object($result)) { if (node_access($node)) { - $output .= "

nid\">". check_output($node->title) ."
$node->type - ". format_name($node->name) ." - ". format_date($node->timestamp, "small") ."

"; + $output .= "

nid\">". check_output($node->title) ."
$node->type - ". format_name($node) ." - ". format_date($node->timestamp, "small") ."

"; } } @@ -110,7 +110,6 @@ elseif ($number) { $theme->footer(); break; default: - user_rehash(); node_render($node); } } -- cgit v1.2.3