From 4cfafa9f617d528fcad773ece003970f088c30c8 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 Dec 2010 08:19:03 +0000
Subject: [PATCH] Report de r16625 et r16636
---
ecrire/action/redirect.php | 8 ++++++--
htaccess.txt | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ecrire/action/redirect.php b/ecrire/action/redirect.php
index 069640fdf0..f7ab0e90ee 100644
--- a/ecrire/action/redirect.php
+++ b/ecrire/action/redirect.php
@@ -23,10 +23,14 @@ function action_redirect_dist()
$m = 'var_mode='.urlencode($m);
}
$h = generer_url_entite_absolue(intval(_request('id')), $type, $m, '', true);
+ $status = '302';
+ if (_request('status') AND _request('status')=='301')
+ $status = '301';
+
if ($h)
- redirige_par_entete(str_replace('&', '&', $h));
+ redirige_par_entete(str_replace('&', '&', $h),'',$status);
else
- redirige_par_entete('/');
+ redirige_par_entete('/','',$status);
}
?>
diff --git a/htaccess.txt b/htaccess.txt
index 8e01fbcbe5..c300fd0c30 100644
--- a/htaccess.txt
+++ b/htaccess.txt
@@ -85,7 +85,7 @@ RewriteRule ^spip_rss\.php3?$ spip.php?page=rss [QSA,L]
###
# ping http://site/1234 => article1234
-RewriteRule ^([1-9][0-9]*)$ spip.php?action=redirect&type=article&id=$1 [QSA,L]
+RewriteRule ^([1-9][0-9]*)$ spip.php?action=redirect&type=article&status=301&id=$1 [QSA,L]
#
###
--
GitLab