Index: database/updates.inc =================================================================== RCS file: /cvs/drupal/drupal/database/updates.inc,v retrieving revision 1.100 diff -u -F^f -r1.100 updates.inc --- database/updates.inc 23 Mar 2005 06:12:30 -0000 1.100 +++ database/updates.inc 25 Mar 2005 13:30:59 -0000 @@ -107,6 +107,18 @@ "2005-03-21" => "update_128" ); +function update_sql($sql) { + $args = func_get_args(); + array_shift($args); + $result = db_query($sql, $args); + if ($result) { + return array('1', nl2br(htmlentities($sql)) ." ", "
OK
\n"); + } + else { + return array('0', nl2br(htmlentities($sql)) ." ", "
FAILED
\n"); + } +} + function update_32() { $ret = array(); $ret[] = update_sql("ALTER TABLE users ADD index (sid(4))"); @@ -2282,7 +2294,7 @@ function update_124() { $result = db_query("SELECT c.nid, c.timestamp, c.name, c.uid, COUNT(c.nid) as comment_count FROM {node} n LEFT JOIN {comments} c ON c.nid = n.nid WHERE c.status = 0 GROUP BY c.nid, c.timestamp, c.name, c.uid"); while ($comment_record = db_fetch_object($result)) { $count = db_result(db_query('SELECT COUNT(cid) FROM {comments} WHERE nid = %d AND status = 0', $comment_record->nid)); - $ret[] = update_sql("UPDATE {node_comment_statistics} SET comment_count = $count, last_comment_timestamp = $comment_record->timestamp, last_comment_name = '$comment_record->name', last_comment_uid = $comment_record->uid WHERE nid = $comment_record->nid"); + $ret[] = update_sql("UPDATE {node_comment_statistics} SET comment_count = $count, last_comment_timestamp = $comment_record->timestamp, last_comment_name = '%s', last_comment_uid = $comment_record->uid WHERE nid = $comment_record->nid", $comment_record->name); } return $ret; @@ -2326,17 +2338,6 @@ function update_127() { return $ret; } -function update_sql($sql) { - $edit = $_POST["edit"]; - $result = db_query($sql); - if ($result) { - return array('1', nl2br(htmlentities($sql)) ." ", "
OK
\n"); - } - else { - return array('0', nl2br(htmlentities($sql)) ." ", "
FAILED
\n"); - } -} - function update_128() { $ret = array();