From 8a348fb192628dcda00d88db1c2a471c7769da87 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Sun, 11 Jun 2006 21:28:46 +0000
Subject: [PATCH] =?UTF-8?q?Determiner=5Fupload=20concerne=20seulement=20l'?=
=?UTF-8?q?espace=20priv=C3=A9.=20Et=20mieux=20vaux=20citer=20les=20consta?=
=?UTF-8?q?ntes.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc/session.php | 14 ++++++++++++++
ecrire/inc/utils.php | 15 ---------------
ecrire/public/boucles.php | 2 +-
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/ecrire/inc/session.php b/ecrire/inc/session.php
index be3c07c901..ed242312ad 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 7bc8485c85..b01112ddb5 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 184174664f..fefc7cbe54 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")
--
GitLab