| 206,16 → 206,16 |
|---|
| } |
| } |
| |
| $pays_str = ''; |
| if($pays != null) { |
| $pays_str = '(code_iso_3166_1 = '.$this->bdd->proteger($pays).' OR '. |
| 'code_iso_3166_2 LIKE '.$this->bdd->proteger($pays."%").')'; |
| // Si le pays correspond, on fait remonter le résultat |
| $champs_tri .= ', IF(code_iso_3166_1 = ' . $this->bdd->proteger($pays) |
| . ' OR ' . 'code_iso_3166_2 LIKE ' . $this->bdd->proteger($pays."%") . ', 1, 0) as pays_correspond '; |
| $ordre = 'pays_correspond DESC, ' . $ordre; |
| } |
| |
| $requete = "SELECT $champs, $champs_tri FROM osm_zones_admin ". |
| "WHERE ". |
| (!empty($niveau_str) ? ("niveau IN (".implode(',', $niveau_str).") AND ") : ""). |
| (!empty($pays_str) ? $pays_str.' AND ' : ""). |
| "(nom LIKE ".$this->bdd->proteger($masque_fmt).' OR '. |
| "intitule LIKE ".$this->bdd->proteger($masque_fmt).' OR '. |
| "nom_fr LIKE ".$this->bdd->proteger($masque_fmt).' OR '. |
| Property changes: |
|---|
| Modified: svn:mergeinfo |
|---|
| Merged /branches/v5.12-baouque/services/modules/0.1/osm/ZoneAdmin.php:r1226 |
|---|