diff --git a/ecrire/inc/session.php b/ecrire/inc/session.php index be3c07c901dac348ed7dfb3d8d790bb0825bfa95..ed242312adf1e52ab5d49cb4d257039f70542d22 100644 --- a/ecrire/inc/session.php +++ b/ecrire/inc/session.php @@ -293,4 +293,18 @@ function generer_action_auteur($action, $arg, $redirect="", $no_entites=false) return generer_url_action($action, "arg=$arg&id_auteur=$connect_id_auteur&hash=$hash$redirect", $no_entites); } +function determine_upload() +{ + global $connect_toutes_rubriques, $connect_login, $connect_statut ; + + if (!$GLOBALS['flag_upload']) return false; + if (!$connect_statut) { + $var_auth = charger_fonction('auth', 'inc'); + $var_auth = $var_auth(); + } + if ($connect_statut != '0minirezo') return false; + return _DIR_TRANSFERT . + ($connect_toutes_rubriques ? '' : ($connect_login . '/')); +} + ?> diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index 7bc8485c8507d96d181b888db83890398cf60911..b01112ddb5130cb8a619cc5b801c19c238232c7a 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -1123,21 +1123,6 @@ function verifier_visiteur() { } } -function determine_upload() -{ - global $connect_toutes_rubriques, $connect_login, $connect_statut ; - - if (!$GLOBALS['flag_upload']) return false; - if (!$connect_statut) { - $var_auth = charger_fonction('auth', 'inc'); - $var_auth = $var_auth(); - } - if ($connect_statut != '0minirezo') return false; - return _DIR_TRANSFERT . - ($connect_toutes_rubriques ? '' : ($connect_login . '/')); -} - - // // INITIALISER LES CONSTANTES ET LES VARIABLES SYSTEMES DE SPIP // diff --git a/ecrire/public/boucles.php b/ecrire/public/boucles.php index 184174664f2a4844011805f113a0b4cec1433ea4..fefc7cbe5459720a2f5b639bd897c1940fd3cb7b 100644 --- a/ecrire/public/boucles.php +++ b/ecrire/public/boucles.php @@ -209,7 +209,7 @@ function boucle_HIERARCHIE_dist($id_boucle, &$boucles) { . ($boucle->tout ? 'false' : 'true') . ');'; - $boucle->having[]= array("'<>'", "rang", 0); + $boucle->having[]= array("'<>'", "'rang'", 0); $boucle->select[]= "FIELD($id_table" . '.id_rubrique, $hierarchie) AS rang'; if ($boucle->default_order[0] != " DESC")