Subversion Repositories eFlore/Applications.cel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 3031 → Rev 3034

/branches/v2.26-scie/jrest/services/CelSyndicationImage.php
434,12 → 434,9
private function creerRequeteSansParametres() {
// Première sous requete pour que le limite se fasse d'abord sur les images
// et pas la jointure de toutes les tables
$sous_requete = 'SELECT * '.
$sous_requete = 'SELECT c.* '.
'FROM cel_images c '.
'WHERE id_image '.
' IN (SELECT id_image FROM cel_images a '.
(($this->etreFluxAdmin()) ? '' : 'INNER JOIN cel_obs b ON a.ce_observation = b.id_observation AND b.transmission = 1 ').
') ';
(($this->etreFluxAdmin()) ? '' : 'INNER JOIN cel_obs b ON c.ce_observation = b.id_observation AND b.transmission = 1 ');
$sous_requete .= ' ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'c.date_creation DESC').' '.
"LIMIT $this->start,$this->limit ";
 
731,4 → 728,4
$intitule = $this->auteurs[$courriel];
return $intitule;
}
}
}
/branches/v2.26-scie/jrest/services
Property changes:
Modified: svn:mergeinfo
Merged /trunk/jrest/services:r3033
/branches/v2.26-scie/jrest
Property changes:
Modified: svn:mergeinfo
Merged /trunk/jrest:r3033
/branches/v2.26-scie/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r3033