|
@@ -297,7 +297,7 @@ discard block |
|
|
block discarded – undo |
|
297
|
297
|
? $this->persister->expandCriteriaParameters($criteria) |
|
298
|
298
|
: $this->persister->expandParameters($criteria); |
|
299
|
299
|
|
|
300
|
|
- return sha1($query . serialize($params) . serialize($orderBy) . $limit . $offset . $timestamp); |
|
|
300
|
+ return sha1($query.serialize($params).serialize($orderBy).$limit.$offset.$timestamp); |
|
301
|
301
|
} |
|
302
|
302
|
|
|
303
|
303
|
/** |
|
@@ -631,7 +631,7 @@ discard block |
|
|
block discarded – undo |
|
631
|
631
|
// Complete bidirectional association, if necessary |
|
632
|
632
|
if ($foundEntity !== null |
|
633
|
633
|
&& $assoc['inversedBy'] |
|
634
|
|
- && !$targetClass->isCollectionValuedAssociation($assoc['inversedBy']) |
|
|
634
|
+ && ! $targetClass->isCollectionValuedAssociation($assoc['inversedBy']) |
|
635
|
635
|
) { |
|
636
|
636
|
$targetClass->reflFields[$assoc['inversedBy']]->setValue($foundEntity, $sourceEntity); |
|
637
|
637
|
} |
Please login to merge, or discard this patch.