diff -urpN drupal-6.x-dev-200708091623/includes/database.mysqli.inc drupal-6.x-dev-rmresultrow-0.1/includes/database.mysqli.inc --- drupal-6.x-dev-200708091623/includes/database.mysqli.inc 2007-07-23 16:05:14.000000000 +0800 +++ drupal-6.x-dev-rmresultrow-0.1/includes/database.mysqli.inc 2007-08-10 21:18:04.000000000 +0800 @@ -211,14 +211,12 @@ function db_num_rows($result) { * * @param $result * A database query result resource, as returned from db_query(). -* @param $row -* The index of the row whose result is needed. * @return * The resulting field or FALSE. */ -function db_result($result, $row = 0) { - if ($result && mysqli_num_rows($result) > $row) { - $array = mysqli_fetch_array($result, MYSQLI_NUM); +function db_result($result) { + if ($result && mysqli_num_rows($result) > 0) { + $array = mysqli_fetch_row($result); return $array[0]; } return FALSE; diff -urpN drupal-6.x-dev-200708091623/includes/database.mysql.inc drupal-6.x-dev-rmresultrow-0.1/includes/database.mysql.inc --- drupal-6.x-dev-200708091623/includes/database.mysql.inc 2007-07-23 16:05:14.000000000 +0800 +++ drupal-6.x-dev-rmresultrow-0.1/includes/database.mysql.inc 2007-08-10 21:16:59.000000000 +0800 @@ -212,14 +212,13 @@ function db_num_rows($result) { * * @param $result * A database query result resource, as returned from db_query(). - * @param $row - * The index of the row whose result is needed. * @return * The resulting field or FALSE. */ -function db_result($result, $row = 0) { - if ($result && mysql_num_rows($result) > $row) { - return mysql_result($result, $row); +function db_result($result) { + if ($result && mysql_num_rows($result) > 0) { + $array = mysql_fetch_row($result); + return $array[0]; } return FALSE; } diff -urpN drupal-6.x-dev-200708091623/includes/database.pgsql.inc drupal-6.x-dev-rmresultrow-0.1/includes/database.pgsql.inc --- drupal-6.x-dev-200708091623/includes/database.pgsql.inc 2007-07-23 16:05:14.000000000 +0800 +++ drupal-6.x-dev-rmresultrow-0.1/includes/database.pgsql.inc 2007-08-10 21:18:22.000000000 +0800 @@ -229,16 +229,13 @@ function db_num_rows($result) { * * @param $result * A database query result resource, as returned from db_query(). - * @param $row - * The index of the row whose result is needed. * @return * The resulting field or FALSE. */ -function db_result($result, $row = 0) { - if ($result && pg_num_rows($result) > $row) { - $res = pg_fetch_row($result, $row); - - return $res[0]; +function db_result($result) { + if ($result && pg_num_rows($result) > 0) { + $array = pg_fetch_row($result); + return $array[0]; } return FALSE; } diff -urpN drupal-6.x-dev-200708091623/modules/comment/comment.module drupal-6.x-dev-rmresultrow-0.1/modules/comment/comment.module --- drupal-6.x-dev-200708091623/modules/comment/comment.module 2007-07-31 05:27:34.000000000 +0800 +++ drupal-6.x-dev-rmresultrow-0.1/modules/comment/comment.module 2007-08-10 21:19:49.000000000 +0800 @@ -1398,7 +1398,7 @@ function comment_validate($edit) { if (!$user->uid || isset($edit['is_anonymous'])) { if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) > COMMENT_ANONYMOUS_MAYNOT_CONTACT) { if ($edit['name']) { - $taken = db_result(db_query("SELECT COUNT(uid) FROM {users} WHERE LOWER(name) = '%s'", $edit['name']), 0); + $taken = db_result(db_query("SELECT COUNT(uid) FROM {users} WHERE LOWER(name) = '%s'", $edit['name'])); if ($taken != 0) { form_set_error('name', t('The name you used belongs to a registered user.'));