Subversion Repositories eFlore/Applications.cel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 2582 → Rev 2583

/branches/v2.10-motoculteur/widget/modules/photo/Photo.php
213,7 → 213,7
private function traiterParametres() {
$parametres_flux = '?';
$criteres = array('utilisateur', 'commune', 'dept', 'taxon', 'commentaire', 'date', 'tag', 'motcle', 'projet', 'num_taxon');
$criteres = array('utilisateur', 'commune', 'dept', 'taxon', 'commentaire', 'date', 'tag', 'motcle', 'projet', 'num_taxon', 'num_nom');
foreach($this->parametres as $nom_critere => $valeur_critere) {
if (in_array($nom_critere, $criteres)) {
$valeur_critere = str_replace(' ', '%20', $valeur_critere);
/branches/v2.10-motoculteur/widget
Property changes:
Modified: svn:mergeinfo
Merged /trunk/widget:r2581-2582
/branches/v2.10-motoculteur/jrest/services/CelSyndicationImage.php
34,6 → 34,7
'dept' => 'b.ce_zone_geo',
'taxon' => 'b.nom_ret',
'num_taxon' => 'b.nt',
'num_nom' => 'b.nom_sel_nn',
'commentaire' => 'c.commentaire',
'date' => 'c.date_prise_de_vue',
'tag' => 'tag',
468,7 → 469,6
$requete = rtrim($requete, 'AND ');
$requete .= ' ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby :
'c.date_creation DESC').' '."LIMIT $this->start,$this->limit ";
//echo $requete;
return $requete;
}
 
/branches/v2.10-motoculteur/jrest/services
Property changes:
Modified: svn:mergeinfo
Merged /trunk/jrest/services:r2581-2582
/branches/v2.10-motoculteur/jrest
Property changes:
Modified: svn:mergeinfo
Merged /trunk/jrest:r2581-2582
/branches/v2.10-motoculteur/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r2581-2582