hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FixCollDisplay' into 3.6

Browse Source
This commit is contained in:
Romain Neutron
2011-12-27 19:51:17 +01:00
parent 4ab724b8de 1774110a33
commit 5e568b0062
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/classes/databox.class.php
View File

@@ -277,6 +277,7 @@ class databox extends base
SUM(1) AS n, SUM(size) AS siz FROM (record, subdef) SUM(1) AS n, SUM(size) AS siz FROM (record, subdef)
LEFT JOIN coll ON record.coll_id=coll.coll_id LEFT JOIN coll ON record.coll_id=coll.coll_id
WHERE record.record_id = subdef.record_id WHERE record.record_id = subdef.record_id
GROUP BY record.coll_id, name
UNION UNION
SELECT coll.coll_id, 0, asciiname, '_' AS name, 0 AS n, 0 AS siz SELECT coll.coll_id, 0, asciiname, '_' AS name, 0 AS n, 0 AS siz
FROM coll LEFT JOIN record ON record.coll_id=coll.coll_id FROM coll LEFT JOIN record ON record.coll_id=coll.coll_id