From de16b23259aff56d227f74c478841695b5872dd2 Mon Sep 17 00:00:00 2001
From: James <james@rezo.net>
Date: Mon, 16 Oct 2006 21:39:05 +0000
Subject: [PATCH] =?UTF-8?q?on=20d=C3=A9place=20maintenant=20ecrire/data=20?=
=?UTF-8?q?et=20CACHE/=20dans=20un=20nouveau=20r=C3=A9pertoire=20tmp/=20(a?=
=?UTF-8?q?insi,=20on=20a=20plus=20besoin=20d'avoir=20un=20sous-r=C3=A9per?=
=?UTF-8?q?toire=20de=20=5FDIR=5FRESTREINT=20en=20=C3=A9criture.=20Il=20y?=
=?UTF-8?q?=20a=20encore=20du=20travail=20:=20le=20r=C3=A9pertoire=20uploa?=
=?UTF-8?q?d/,=20le=20cache=20des=20vignettes=20et=20sans=20doute=20mieux?=
=?UTF-8?q?=20g=C3=A9rer=20ce=20r=C3=A9pertoire=20tmp/=20...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 +
.gitignore | 20 ++++++++++----------
ecrire/inc_version.php | 12 ++++++------
{CACHE => tmp/CACHE}/remove.txt | 0
{ecrire => tmp}/data/remove.txt | 0
tmp/remove.txt | 3 +++
6 files changed, 20 insertions(+), 16 deletions(-)
rename {CACHE => tmp/CACHE}/remove.txt (100%)
rename {ecrire => tmp}/data/remove.txt (100%)
create mode 100644 tmp/remove.txt
diff --git a/.gitattributes b/.gitattributes
index c054b30ed1..a49d2cac74 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -525,4 +525,5 @@ ecrire/xml/rss.php -text
/index.php -text
/rien.gif -text
/spip.php -text
+tmp/remove.txt -text
/win_png.htc -text
diff --git a/.gitignore b/.gitignore
index f69eedcf9a..9e9fee2c44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-CACHE/?
-CACHE/lang_*
-CACHE/skel_*
IMG/artoff*
IMG/arton*
IMG/autoff*
@@ -15,12 +12,15 @@ IMG/rubon*
IMG/siteoff*
IMG/siteon*
IMG/test_*
-ecrire/data/.htaccess
-ecrire/data/.htpasswd
-ecrire/data/.htpasswd-admin
-ecrire/data/.index
-ecrire/data/inc_meta_cache.php3
-ecrire/data/session_*
-ecrire/data/spip.log*
ecrire/inc_connect.php3
ecrire/inc_meta_cache.php3
+tmp/CACHE/?
+tmp/CACHE/lang_*
+tmp/CACHE/skel_*
+tmp/data/.htaccess
+tmp/data/.htpasswd
+tmp/data/.htpasswd-admin
+tmp/data/.index
+tmp/data/inc_meta_cache.php3
+tmp/data/session_*
+tmp/data/spip.log*
diff --git a/ecrire/inc_version.php b/ecrire/inc_version.php
index c8b230a87b..c1aa24721c 100644
--- a/ecrire/inc_version.php
+++ b/ecrire/inc_version.php
@@ -270,15 +270,15 @@ function spip_initialisation_parametree($dir1, $dir2) {
define('_DIR_IMG', $dir1 ."IMG/");
define('_DIR_DOC', $dir1 ."IMG/");
define('_DIR_LOGOS', $dir1 ."IMG/");
- define('_DIR_CACHE', $dir1 ."CACHE/");
- define('_DIR_SKELS', $dir1 ."CACHE/skel/");
+ define('_DIR_CACHE', $dir1 ."tmp/CACHE/");
+ define('_DIR_SKELS', $dir1 ."tmp/CACHE/skel/");
define('_DIR_PLUGINS', $dir1 . "plugins/");
define('_DIR_CONFIG', $dir1 . "config/");
- define('_DIR_TMP', $dir2 . "data/");
- define('_DIR_DUMP', $dir2 . "data/");
- define('_DIR_SESSIONS', $dir2 . "data/");
+ define('_DIR_TMP', $dir1 . "tmp/");
+ define('_DIR_DUMP', $dir1 . "tmp/data/");
+ define('_DIR_SESSIONS', $dir1 . "tmp/data/");
define('_DIR_TRANSFERT', $dir2 . "upload/");
// les fichiers qu'on y met, entre autres
@@ -301,7 +301,7 @@ function spip_initialisation_parametree($dir1, $dir2) {
: false))));
if (!isset($GLOBALS['test_dirs']))
- $GLOBALS['test_dirs'] = array(_DIR_CACHE, _DIR_IMG, _DIR_TMP);
+ $GLOBALS['test_dirs'] = array(_DIR_IMG, _DIR_TMP);
}
//
diff --git a/CACHE/remove.txt b/tmp/CACHE/remove.txt
similarity index 100%
rename from CACHE/remove.txt
rename to tmp/CACHE/remove.txt
diff --git a/ecrire/data/remove.txt b/tmp/data/remove.txt
similarity index 100%
rename from ecrire/data/remove.txt
rename to tmp/data/remove.txt
diff --git a/tmp/remove.txt b/tmp/remove.txt
new file mode 100644
index 0000000000..28138d7bdd
--- /dev/null
+++ b/tmp/remove.txt
@@ -0,0 +1,3 @@
+Vous pouvez effacer ce fichier sans dommages.
+
+You can safely remove this file.
--
GitLab