Subversion Repositories eFlore/Applications.del

Compare Revisions

Ignore whitespace Rev 1980 → Rev 1981

/trunk/services/bibliotheque/Sql.php
113,7 → 113,7
if (isset($this->requete['where']['OR_SOUS_REQUETE']) && count($this->requete['where']['OR_SOUS_REQUETE']) > 0) {
$clauseWhereSousRequete = implode(' OR ', $this->requete['where']['OR_SOUS_REQUETE']);
$sousRequete = 'di.ce_observation IN '.
"(SELECT DISTINCT id_observation FROM del_observation AS do WHERE $clauseWhereSousRequete ) ";
"(SELECT id_observation FROM del_observation AS do WHERE $clauseWhereSousRequete ) ";
$this->requete['where']['OR'][] = "( $sousRequete )";
unset($this->requete['join']['LEFT JOIN del_observation AS do ON (di.ce_observation = do.id_observation) ']);
}
524,7 → 524,7
foreach ($tags as $tag) {
$tagMotif = $this->bdd->proteger("%$tag%");
if ($this->etreAppliImg()) {
$sousRequete = 'SELECT DISTINCT id_observation '.
$sousRequete = 'SELECT id_observation '.
'FROM del_observation '.
"WHERE mots_cles_texte LIKE $tagMotif ";
$sql = " (di.mots_cles_texte LIKE $tagMotif OR di.id_image IN ($sousRequete) ) ";