Subversion Repositories eFlore/Applications.del

Rev

Rev 1913 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1913 Rev 1914
Line 469... Line 469...
469 
				$tags = $this->parametres['masque.tag_cel']['OR'];
 469 
				$tags = $this->parametres['masque.tag_cel']['OR'];
470 
				$sqlTpl = "CONCAT(IFNULL(do.mots_cles_texte,''),IFNULL(di.mots_cles_texte,'')) REGEXP %s";
 470 
				$sqlTpl = "CONCAT(IFNULL(do.mots_cles_texte,''),IFNULL(di.mots_cles_texte,'')) REGEXP %s";
471 
				$tagMotif = $this->bdd->proteger(implode('|', $tags));
 471 
				$tagMotif = $this->bdd->proteger(implode('|', $tags));
472 
				$tagSql = sprintf($sqlTpl, $tagMotif);
 472 
				$tagSql = sprintf($sqlTpl, $tagMotif);
473 
				$this->addWhere('masque.tag_cel', $tagSql);
 473 
				$this->addWhere('masque.tag_cel', $tagSql);
- 
 
 474 
				if ($this->etreAppliObs()) {
- 
 
 475 
					$this->addJoin('LEFT JOIN del_image AS di ON (di.ce_observation = do.id_observation) ');
- 
 
 476 
				}
474 
			}
 477 
			}
475 
			if ($this->etreAppliImg()) {
 478 
			if ($this->etreAppliImg()) {
476 
				$this->addJoin('LEFT JOIN del_observation AS do ON (di.ce_observation = do.id_observation) ');
 479 
				$this->addJoin('LEFT JOIN del_observation AS do ON (di.ce_observation = do.id_observation) ');
477 
			}
 480 
			}
478 
		}
 481 
		}