Merge remote-tracking branch 'remotes/dev/1.9' into 1.5

freliberty · Apr 8, 2016 · 2e73f97 · 2e73f97
2 parents 1690e54 + 130bfd4
commit 2e73f97
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Provider/Transport/Iterator/MemberSyncIterator.php b/Provider/Transport/Iterator/MemberSyncIterator.php
@@ -158,11 +158,16 @@ protected function addNameFields($entityName, QueryBuilder $qb)
         $entityAlias = $from[0]->getAlias();
         $parts = $this->formatter->extractNamePartsPaths($entityName, $entityAlias);
 
+        $this->hasFirstName = false;
+        $this->firstNameField = null;
         if (isset($parts['first_name'])) {
             $this->hasFirstName = true;
             $this->firstNameField = $parts['first_name'];
             $qb->addSelect($this->firstNameField . ' as first_name');
         }
+
+        $this->hasLastName = false;
+        $this->lastNameField = null;
         if (isset($parts['last_name'])) {
             $this->hasLastName = true;
             $this->lastNameField = $parts['last_name'];