WebSVN – eFlore/Archives.eflore-consultation-v2 – Path Comparison – / – /trunk/serveur/eflore_mv/modeles/macro_elements/NOM_RECHERCHE.php Rev 172 and /trunk/serveur/eflore_mv/modeles/macro_elements/NOM

Ignore whitespace Rev 172 → Rev 173

 /trunk/serveur/eflore_mv/modeles/macro_elements/NOM_RECHERCHE.php
 ,10 → 3,10
     function getSQL()
     {
         $contexte = array();
-        if (array_key_exists('radical', $this->contexteRef) and array_key_exists('rang', $this->contexteRef) ) {
+        if (array_key_exists('radical', $this->contexteRef) AND array_key_exists('rang', $this->contexteRef) ) {
             $contexte['radical'] = $this->contexteRef['radical'];
             $contexte['rang'] = $this->contexteRef['rang'];
-            if(!empty($contexte['radical']) and !empty($contexte['rang']) ) {
+            if(!empty($contexte['radical']) AND !empty($contexte['rang']) ) {
                 return
                 'SELECT
                 nom.en_id_nom,
 ,10 → 48,10
                 AND nom.en_ce_rang = '.$contexte['rang'];
             }
         }
-        if (array_key_exists('radical', $this->contexteRef) and array_key_exists('nvp', $this->contexteRef) ) {
+        if (array_key_exists('radical', $this->contexteRef) AND array_key_exists('nvp', $this->contexteRef) ) {
             $contexte['radical'] = $this->contexteRef['radical'];
             $contexte['nvp'] = $this->contexteRef['nvp'];
-            if(!empty($contexte['nvp']) ) {
+            if(!empty($contexte['radical']) AND !empty($contexte['nvp']) ) {
                 return
                     'SELECT
                     nom.*,