merge

.gitattributes

@@ -2139,6 +2139,7 @@ cosmogramme/sql/patch/patch_156.sql -text
 cosmogramme/sql/patch/patch_157.sql -text
 cosmogramme/sql/patch/patch_158.sql -text
 cosmogramme/sql/patch/patch_159.sql -text
+cosmogramme/sql/patch/patch_160.sql -text
 cosmogramme/storm_init.php -text
 cosmogramme/tests/bootstrap.php -text
 cosmogramme/tests/php/classes/IndexationTest.php -text

cosmogramme/php/_init.php

 <?PHP
 // Constantes
 define("VERSION_COSMOGRAMME","6.32");
-define("PATCH_LEVEL","159");
+define("PATCH_LEVEL","160");
 define("APPLI","cosmogramme");
 define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs");
 define("CRLF", chr(13) . chr(10));

cosmogramme/sql/patch/patch_159.sql

+<<<<<<< HEAD
 
 alter table bib_admin_users add column IS_CONTACT_SMS boolean default false;
 alter table bib_admin_users add column IS_CONTACT_MAIL boolean default false;
 insert into bib_admin_var(clef,valeur) values('CHAMPS_FICHE_UTILISATEUR','nom;prenom;pseudo;mail;password') on duplicate key update valeur='nom;prenom;pseudo;mail;password';
+=======
+>>>>>>> Affichage des catalogues dynamiques dans les facettes + import des thesaurus en prenant en compte les libelles pour les facettes
 insert into codif_thesaurus  (id_thesaurus,libelle,code) values('CCCC','Domaine','Catalogue');
 

cosmogramme/sql/patch/patch_160.sql

+insert into codif_thesaurus  (id_thesaurus,libelle,code) values('CCCC','Domaine','Catalogue');
+

library/Class/CodifThesaurus.php

@@ -118,7 +118,6 @@ class Class_CodifThesaurusLoader extends Storm_Model_Loader {
 	}
 
 
-
  	public function getIndices($pere,$with_catalogue_dynamique=false)	{
 		if ($pere == "root")  {
 			$where='';