Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup

This commit is contained in:
Michael Vogel 2016-06-12 21:07:45 +02:00
commit c68f28bc77
12 changed files with 453 additions and 10 deletions

View file

@ -289,7 +289,7 @@ function admin_page_federation(&$a) {
// what versions for that platform do we know at all?
// again only the active nodes
$v = q('SELECT COUNT(*) AS `total, version` FROM `gserver`
$v = q('SELECT COUNT(*) AS `total`, `version` FROM `gserver`
WHERE `last_contact` > `last_failure` AND `platform` LIKE "%s" AND `version` != ""
GROUP BY `version`
ORDER BY `version`;', $p);