summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2026-05-21 17:05:08 +0200
committerSimon Rettberg2026-05-21 17:05:08 +0200
commitec8e3ca47cb5ed9f67f60a977f45a0f956b668a8 (patch)
tree81ac9e792adabd1dc84204744b67f53c01ecd0b2
parent[webinterface] Show current proxy chain in trusted proxy dialog (diff)
downloadslx-admin-master.tar.gz
slx-admin-master.tar.xz
slx-admin-master.zip
[statistics] Fix ambiguous column referenceHEADmaster
-rw-r--r--modules-available/statistics/inc/statisticsfilter.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules-available/statistics/inc/statisticsfilter.inc.php b/modules-available/statistics/inc/statisticsfilter.inc.php
index 72856c51..ef5ff0f0 100644
--- a/modules-available/statistics/inc/statisticsfilter.inc.php
+++ b/modules-available/statistics/inc/statisticsfilter.inc.php
@@ -593,7 +593,7 @@ class LocationStatisticsFilter extends EnumStatisticsFilter
if ($recursive) {
$argument = Location::getAllLocationIds((int)$argument, true);
} elseif ($argument == 0) {
- return 'locationid IS ' . ($operator === '!=' ? 'NOT' : '') . ' NULL';
+ return 'm.locationid IS ' . ($operator === '!=' ? 'NOT' : '') . ' NULL';
}
return parent::whereClause($operator, $argument, $args, $joins);
}
@@ -630,7 +630,7 @@ class IpStatisticsFilter extends StatisticsFilter
Message::addError('invalid-cidr-notion', $argument);
return '0';
}
- return 'INET_ATON(' . $this->column . ') BETWEEN ' . $range['start'] . ' AND ' . $range['end'];
+ return 'INET_ATON(m.' . $this->column . ') BETWEEN ' . $range['start'] . ' AND ' . $range['end'];
} elseif (($num = substr_count($argument, ':')) !== 0 && $num <= 7) {
// TODO: Probably valid IPv6, not yet in DB
} elseif (($num = substr_count($argument, '.')) !== 0 && $num <= 3) {