Skip to content

Commit

Permalink
Merge pull request #854 from creative-commoners/pulls/6/merge-conflict
Browse files Browse the repository at this point in the history
Merge branch '6.0' into 6
  • Loading branch information
emteknetnz authored May 24, 2024
2 parents acb1466 + f54103b commit 04c6358
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Extension/FluentExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
if (empty($localisedPredicate)) {
continue;
}

$where[$index] = [
$localisedPredicate => $parameters
];
Expand Down Expand Up @@ -629,7 +629,7 @@ public function onAfterWrite(): void
{
$this->handleClassChanged();
}

/**
* If an object is duplicated also duplicate existing localised values from original to new object.
*/
Expand Down

0 comments on commit 04c6358

Please sign in to comment.