diff --git a/article.html b/article.html index ca9d53bb20e7a712b96e47f320355b6835c41983..b61c868fa30b42aca26cfc19a4a5a4f7e8e44901 100644 --- a/article.html +++ b/article.html @@ -130,8 +130,8 @@ </div><!-- Fin de .texte --> <!-- Signatures petition --> -<BOUCLE_signatures_decompte(SIGNATURES?) {id_article}></BOUCLE_signatures_decompte> -[<div class="signatures-titre">(#TOTAL_BOUCLE|>{0}|?{#TOTAL_BOUCLE,''}) <:signatures_petition:></div> +<BOUCLE_signatures> +<div class="signatures-titre">#TOTAL_BOUCLE <:signatures_petition:></div> <table class="signatures"> <thead class="structure"> @@ -140,8 +140,7 @@ <th><:nom:></th> </tr> </thead> -<tbody>] -<//B_signatures_decompte> +<tbody> <BOUCLE_signatures(SIGNATURES?) {id_article} {!par date} {0,30}> <tr[(#COMPTEUR_BOUCLE|alterner{' class="alt"',''})]> <td class="signature-date">[(#DATE|affdate_court)]</td> diff --git a/base/soyezcreateurs.php b/base/soyezcreateurs.php index 43489bd827d0dd1e5c1fe89b321c653f23c577ff..c21f302b936d0763387d82eacf14306ff215e178 100644 --- a/base/soyezcreateurs.php +++ b/base/soyezcreateurs.php @@ -704,7 +704,7 @@ function create_document($chemin, $objet, $mode, $champs='non', $id_document='no return false; } -function create_logo($chemin, $type='article', $id, $ext, $onoff='on') { +function create_logo($chemin, $type, $id, $ext, $onoff='on') { include_spip('action/editer_logo'); $erreur = logo_modifier($type, $id, $onoff, find_in_path($chemin)); return $erreur; diff --git a/soyezcreateurs_administrations.php b/soyezcreateurs_administrations.php index 25ff8af5bc1d893486c8175e9f99241020b2d4ed..f9c448fb6b3127e447fbc061729a6b7ba81639b9 100644 --- a/soyezcreateurs_administrations.php +++ b/soyezcreateurs_administrations.php @@ -7,10 +7,6 @@ if (!defined('_ECRIRE_INC_VERSION')) return; -include_spip('inc/meta'); -include_spip('inc/sc_utils'); -include_spip('inc/cextras'); -include_spip('base/soyezcreateurs'); /* * Fonction d'installation, mise a jour de la base * @@ -19,6 +15,9 @@ include_spip('base/soyezcreateurs'); */ function soyezcreateurs_upgrade($nom_meta_base_version,$version_cible){ if (defined('_BYPASS_SC_INSTALL')) return; + include_spip('inc/meta'); + include_spip('inc/sc_utils'); + include_spip('inc/cextras'); include_spip('base/soyezcreateurs'); $maj = array(); diff --git a/soyezcreateurs_fonctions.php b/soyezcreateurs_fonctions.php index e05b49187a0ec7f0eba34a6c3f1e0892b8f927e0..f6bcd198674f851149363032fc9cf5905902daf3 100644 --- a/soyezcreateurs_fonctions.php +++ b/soyezcreateurs_fonctions.php @@ -162,7 +162,7 @@ function sc_NewLine2str($texte) { return str_replace('"','\"',str_replace("\r",'',str_replace("\n",'\n',$texte))); } -function sc_DateAdd($d=null, $v, $f="Y-m-d"){ +function sc_DateAdd($d=null, $v=0, $f="Y-m-d"){ return date($f,strtotime($v." days",strtotime($d))); }