Skip to content

Commit fc4761c

Browse files
committed
Internal: fix code to adapt to field name changed in extra_field_value from value to field_value - refs bt#21900
1 parent 72e5c1d commit fc4761c

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

public/main/admin/statistics/index.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@
990990
$sql = "SELECT count(id) count
991991
FROM $extraFieldValueUser->table_field_values
992992
WHERE
993-
value = '$value' AND
993+
field_value = '$value' AND
994994
item_id IN ('$userIdListToString') AND
995995
field_id = ".$extraField['id'];
996996
$query = Database::query($sql);
@@ -1074,7 +1074,7 @@
10741074
$sql = "SELECT count(id) count
10751075
FROM $extraFieldValueUser->table_field_values
10761076
WHERE
1077-
value = '$value' AND
1077+
field_value = '$value' AND
10781078
item_id IN ('$userIdListToString') AND
10791079
field_id = ".$extraField['id'];
10801080
$query = Database::query($sql);
@@ -1117,7 +1117,7 @@
11171117
$all = [];
11181118
$total = count($users);
11191119

1120-
$sql = "SELECT value
1120+
$sql = "SELECT field_value
11211121
FROM $extraFieldValueUser->table_field_values
11221122
WHERE
11231123
item_id IN ('$userIdListToString') AND
@@ -1134,11 +1134,11 @@
11341134

11351135
while ($row = Database::fetch_array($query)) {
11361136
$usersFound++;
1137-
if (!empty($row['value'])) {
1138-
$validDate = DateTime::createFromFormat('Y-m-d', $row['value']);
1139-
$validDate = $validDate && $validDate->format('Y-m-d') === $row['value'];
1137+
if (!empty($row['field_value'])) {
1138+
$validDate = DateTime::createFromFormat('Y-m-d', $row['field_value']);
1139+
$validDate = $validDate && $validDate->format('Y-m-d') === $row['field_value'];
11401140
if ($validDate) {
1141-
$date1 = new DateTime($row['value']);
1141+
$date1 = new DateTime($row['field_value']);
11421142
$interval = $now->diff($date1);
11431143
$years = $interval->y;
11441144

@@ -1192,7 +1192,7 @@
11921192
$sql = "SELECT count(id) count
11931193
FROM $extraFieldValueUser->table_field_values
11941194
WHERE
1195-
value = '$value' AND
1195+
field_value = '$value' AND
11961196
item_id IN ('$userIdListToString') AND
11971197
field_id = ".$extraField['id'];
11981198
$query = Database::query($sql);
@@ -1238,7 +1238,7 @@
12381238
$sql = "SELECT count(id) count
12391239
FROM $extraFieldValueUser->table_field_values
12401240
WHERE
1241-
value = 1 AND
1241+
field_value = 1 AND
12421242
item_id IN ('$userIdListToString') AND
12431243
field_id = ".$extraField['id'];
12441244
$query = Database::query($sql);

0 commit comments

Comments
 (0)