diff options
| -rw-r--r-- | includes/database.mysql.inc | 11 | ||||
| -rw-r--r-- | includes/database.mysqli.inc | 10 | ||||
| -rw-r--r-- | includes/database.pgsql.inc | 11 | ||||
| -rw-r--r-- | modules/comment/comment.module | 2 |
4 files changed, 16 insertions, 18 deletions
diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc index db130b5dc..50819a19a 100644 --- a/includes/database.mysql.inc +++ b/includes/database.mysql.inc @@ -212,14 +212,15 @@ 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) { + // The mysql_fetch_row function has an optional second parameter $row + // but that can't be used for compatibility with Oracle, DB2, etc. + $array = mysql_fetch_row($result); + return $array[0]; } return FALSE; } diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc index 883bd72f6..38c3ce572 100644 --- a/includes/database.mysqli.inc +++ b/includes/database.mysqli.inc @@ -211,14 +211,14 @@ 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) { + // The mysqli_fetch_row function has an optional second parameter $row + // but that can't be used for compatibility with Oracle, DB2, etc. + $array = mysqli_fetch_row($result); return $array[0]; } return FALSE; diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc index 287b322cf..e63f00b9d 100644 --- a/includes/database.pgsql.inc +++ b/includes/database.pgsql.inc @@ -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 --git a/modules/comment/comment.module b/modules/comment/comment.module index 3f23fdd78..b5eccdef1 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -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.')); |