Commit 89e7bdee authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Merge branch 'master' into creed

parents b574bbde fc0ece53

module/Oscar/src/Oscar/Connector/ConnectorPersonREST.php

+1 −1
Changes for module/Oscar/src/Oscar/Connector/ConnectorPersonREST.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ class ConnectorPersonREST implements IConnectorPerson, ServiceLocatorAwareInterf 


                if( $personData->dateupdated == null

                    || $personOscar->getDateSyncLdap() == null

                    || $personOscar->getDateSyncLdap() < $personData->dateupdated

                    || $personOscar->getDateSyncLdap()->format('Y-m-d') < $personData->dateupdated

                    || $force == true )

                {

                    $personOscar = $this->getPersonHydrator()->hydratePerson($personOscar, $personData, $this->getName());