X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fweb%2Fclavette_www.git;a=blobdiff_plain;f=www%2Fplugins-dist%2Frevisions%2Finc%2Frevisions.php;h=b3612a1e7f360c663eea13714e5343b629d9839c;hp=c4205e0382b417995df4b22d55c9343fc4a6c46e;hb=cc641eb476987612f6d6df1a5417c1c5582a8ab8;hpb=7d84a490677fb716a1fd4df260f8eab35f6a8506

diff --git a/www/plugins-dist/revisions/inc/revisions.php b/www/plugins-dist/revisions/inc/revisions.php
index c4205e0..b3612a1 100644
--- a/www/plugins-dist/revisions/inc/revisions.php
+++ b/www/plugins-dist/revisions/inc/revisions.php
@@ -3,7 +3,7 @@
 /***************************************************************************\
  *  SPIP, Systeme de publication pour l'internet                           *
  *                                                                         *
- *  Copyright (c) 2001-2014                                                *
+ *  Copyright (c) 2001-2016                                                *
  *  Arnaud Martin, Antoine Pitrou, Philippe Riviere, Emmanuel Saint-James  *
  *                                                                         *
  *  Ce programme est un logiciel libre distribue sous licence GNU/GPL.     *
@@ -605,6 +605,9 @@ function propre_diff($texte) {
 	$reg = end($regs);
 	if (!$reg[1] AND $reg[2]) $texte.="</$reg[2]>";
 
+	// et interdire_scripts !
+	$texte = interdire_scripts($texte);
+
 	return $texte;
 }
 
@@ -708,7 +711,7 @@ function verifier_premiere_revision($table,$objet,$id_objet,$champs=null, $id_au
 
 			$date_modif = "";
 			foreach(array('date_modif','maj') as $d){
-				if (!$date_modif AND isset($originaux[$d]) AND $t=strtotime($d))
+				if (!$date_modif AND isset($originaux[$d]) AND $t=strtotime($originaux[$d]))
 					$date_modif = date("Y-m-d H:i:s", $t);
 			}
 			if (!$date_modif