Commit 8971add8 authored by Gábor Hojtsy's avatar Gábor Hojtsy
Browse files

#163191 follow up patch by hswong3i and pwolanin: use a has_rows flag where we dont need a counter

parent 5d31f595
......@@ -2169,7 +2169,8 @@ function system_update_179() {
$limit = 20;
$args = array_merge(array($_SESSION['system_update_179_uid'], $_SESSION['system_update_179_fid'], $_SESSION['system_update_179_uid']), $_SESSION['system_update_179_fields']);
$result = db_query_range("SELECT fid, uid, value FROM {profile_values} WHERE ((uid = %d AND fid > %d) OR uid > %d) AND fid IN ". $_SESSION['system_update_179_field_string'] .' ORDER BY uid ASC, fid ASC', $args, 0, $limit);
$num_rows = 0;
$has_rows = FALSE;
while ($field = db_fetch_object($result)) {
$_SESSION['system_update_179_uid'] = $field->uid;
$_SESSION['system_update_179_fid'] = $field->fid;
......@@ -2177,11 +2178,11 @@ function system_update_179() {
if ($field->value !== FALSE) {
db_query("UPDATE {profile_values} SET value = '%s' WHERE uid = %d AND fid = %d", $field->value, $field->uid, $field->fid);
}
$num_rows++;
$has_rows = TRUE;
}
// Done?
if ($num_rows == 0) {
if (!$has_rows) {
unset($_SESSION['system_update_179_uid']);
unset($_SESSION['system_update_179_fid']);
unset($_SESSION['system_update_179_max']);
......
......@@ -983,12 +983,12 @@ function taxonomy_select_nodes($tids = array(), $operator = 'or', $depth = 0, $p
*/
function taxonomy_render_nodes($result) {
$output = '';
$num_rows = 0;
$has_rows = FALSE;
while ($node = db_fetch_object($result)) {
$output .= node_view(node_load($node->nid), 1);
$num_rows++;
$has_rows = TRUE;
}
if ($num_rows > 0) {
if ($has_rows) {
$output .= theme('pager', NULL, variable_get('default_nodes_main', 10), 0);
}
else {
......
......@@ -1098,12 +1098,12 @@ function user_current_to_arg($arg) {
function user_get_authmaps($authname = NULL) {
$result = db_query("SELECT authname, module FROM {authmap} WHERE authname = '%s'", $authname);
$authmaps = array();
$num_rows = 0;
$has_rows = FALSE;
while ($authmap = db_fetch_object($result)) {
$authmaps[$authmap->module] = $authmap->authname;
$num_rows++;
$has_rows = TRUE;
}
return $num_rows > 0 ? $authmaps : 0;
return $has_rows ? $authmaps : 0;
}
function user_set_authmaps($account, $authmaps) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment