use db_assoc() rather than db_array() as we're depending on an assoc array afterall.

pull/154/head
David Goodwin 7 years ago
parent 45a1073b97
commit 4e9d166765

@ -515,7 +515,7 @@ function create_page_browser($idxfield, $querypart) {
$query = "SELECT count(*) as counter FROM (SELECT $idxfield $querypart) AS tmp"; $query = "SELECT count(*) as counter FROM (SELECT $idxfield $querypart) AS tmp";
$result = db_query($query); $result = db_query($query);
if ($result['rows'] > 0) { if ($result['rows'] > 0) {
$row = db_array($result['result']); $row = db_assoc($result['result']);
$count_results = $row['counter'] -1; # we start counting at 0, not 1 $count_results = $row['counter'] -1; # we start counting at 0, not 1
} }
# echo "<p>rows: " . ($count_results +1) . " --- $query"; # echo "<p>rows: " . ($count_results +1) . " --- $query";
@ -570,8 +570,8 @@ function create_page_browser($idxfield, $querypart) {
$result = db_query($query); $result = db_query($query);
if ($result['rows'] > 0) { if ($result['rows'] > 0) {
while ($row = db_array($result['result'])) { while ($row = db_assoc($result['result'])) {
if ($row2 = db_array($result['result'])) { if ($row2 = db_assoc($result['result'])) {
$label = substr($row['label'], 0, $label_len) . '-' . substr($row2['label'], 0, $label_len); $label = substr($row['label'], 0, $label_len) . '-' . substr($row2['label'], 0, $label_len);
$pagebrowser[] = $label; $pagebrowser[] = $label;
} else { # only one row remaining } else { # only one row remaining
@ -662,7 +662,7 @@ function list_domains_for_admin($username) {
$result = db_query($query); $result = db_query($query);
if ($result['rows'] > 0) { if ($result['rows'] > 0) {
$i = 0; $i = 0;
while ($row = db_array($result['result'])) { while ($row = db_assoc($result['result'])) {
$list[$i] = $row['domain']; $list[$i] = $row['domain'];
$i++; $i++;
} }
@ -684,7 +684,7 @@ function list_domains() {
$result = db_query("SELECT domain FROM $table_domain WHERE domain!='ALL' ORDER BY domain"); $result = db_query("SELECT domain FROM $table_domain WHERE domain!='ALL' ORDER BY domain");
if ($result['rows'] > 0) { if ($result['rows'] > 0) {
$i = 0; $i = 0;
while ($row = db_array($result['result'])) { while ($row = db_assoc($result['result'])) {
$list[$i] = $row['domain']; $list[$i] = $row['domain'];
$i++; $i++;
} }

Loading…
Cancel
Save