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

resolve conflict

Browse Source
This commit is contained in:
aynsix
2019-12-12 14:33:37 +04:00
parent 0fa7b64fb7 36bbfb424e
commit 48f78698cc
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Alchemy/Phrasea/Databox/Record/LegacyRecordRepository.php
View File

@@ -130,7 +130,7 @@ class LegacyRecordRepository implements RecordRepository
$selects = $this->getRecordSelects();
if($max_items){
if ($max_items) {
array_unshift($selects, 'sr.rid_parent as story_id');
$subBuilder = $connection->createQueryBuilder();
@@ -172,7 +172,7 @@ class LegacyRecordRepository implements RecordRepository
array_merge($subBuilder->getParameterTypes(), $builder->getParameterTypes())
);
}else{
} else {
array_unshift($selects, 's.rid_parent as story_id');
$builder = $connection->createQueryBuilder();
@@ -185,6 +185,7 @@ class LegacyRecordRepository implements RecordRepository
's.rid_parent IN (:storyIds)',
'r.parent_record_id = 0'
)
->orderBy('s.ord', 'ASC')
->setParameter('storyIds', $storyIds, Connection::PARAM_INT_ARRAY)
;