Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 1319 → Rev 1320

/branches/v1.5-cisaille/jrest/services/CelSyndicationImage.php
343,8 → 343,8
}
 
private function creerTitreSimple($element) {
$date_obs_timestamp = $this->convertirDateHeureMysqlEnTimestamp($info['date_observation']);
$date = strftime('%A %d %B %Y', $date_obs_timestamp);
$date = $element['date_observation'];
$date = date("d/m/Y", strtotime($date));
if ($this->etreNull($element['nom_sel']) && $this->etreNull($element['num_nom_sel'])) {
$titre = "Ajout d'une photo par ".$this->auteurs[$element['ci_ce_utilisateur']].' le '.$date;
} else {
/branches/v1.5-cisaille/jrest/services/CelSyndicationObservation.php
498,8 → 498,8
}
private function creerTitre($obs) {
$date_obs_timestamp = $this->convertirDateHeureMysqlEnTimestamp($observation['date_observation']);
$date = strftime('%A %d %B %Y', $date_obs_timestamp);
$date = $obs['date_observation'];
$date = date("d/m/Y", strtotime($date));
$nom_plante = $obs['nom_sel'].' [nn'.$obs['num_nom_sel'].']';
$lieu = $obs['location'].' ('.$obs['id_location'].')';
$utilisateur = $this->auteurs[$obs['identifiant']];