Subversion Repositories eFlore/Applications.del

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2164 → Rev 2165

/branches/v1.10-sodium/services/modules/0.1/observations/VoteObservation.php
54,7 → 54,7
foreach ($resultats as $vote) {
$votes[$vote['id_vote']] = $this->formaterVotes($vote);
$utilisateur = $this->chercherUtilisateur($vote['ce_utilisateur']);
if (count($utilisateur) > 0) {
if ($utilisateur && count($utilisateur) > 0) {
$votes[$vote['id_vote']] = array_merge($votes[$vote['id_vote']], $utilisateur);
}
}
240,4 → 240,4
throw new Exception($msg, RestServeur::HTTP_CODE_MAUVAISE_REQUETE);
}
}
}
}
/branches/v1.10-sodium/services
Property changes:
Modified: svn:mergeinfo
Merged /trunk/services:r2164
/branches/v1.10-sodium
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r2164