report de [14744] [14746] et [14748]

ecrire/inc/utils.php

@@ -699,15 +699,12 @@ define('_ROOT_CWD', getcwd().'/');
 // http://doc.spip.org/@find_in_path
 function find_in_path ($file, $dirname='', $include=false) {
 	static $files=array(), $dirs=array();
-	static $inc = array();
-#if ($include) $GLOBALS['cpt_include']++;
-#spip_timer('include');
+	static $inc = array(); # cf http://trac.rezo.net/trac/spip/changeset/14743
 	if (isset($files[$dirname][$file])) {
-		if ($include) {
+		if ($include AND !isset($inc[$dirname][$file])) {
 			include_once _ROOT_CWD . $files[$dirname][$file];
 			$inc[$dirname][$file] = $inc[''][$dirname . $file] = true;
 		}
-#$GLOBALS['time_include']+=spip_timer('include',true);
 		return  $files[$dirname][$file];
 	}
 
@@ -722,11 +719,10 @@ function find_in_path ($file, $dirname='', $include=false) {
 			$dirs[$a] = (is_dir(_ROOT_CWD . $a) || !$a) ;
 		if ($dirs[$a]) {
 			if (file_exists(_ROOT_CWD . ($a .= $file))) {
-				if ($include) {
+				if ($include AND !isset($inc[$dirname][$file])) {
 					include_once _ROOT_CWD . $a;
 					$inc[$dirname][$file] = $inc[''][$dirname . $file] = true;
 				}
-#$GLOBALS['time_include']+=spip_timer('include',true);
 				return $files[$dirname][$file] = $files[''][$dirname . $file] = $a;
 			}
 		}

ecrire/public/composer.php

@@ -128,16 +128,22 @@ function squelette_traduit($squelette, $sourcefile, $phpfile, $boucles)
 // Le squelette compile est-il trop vieux ?
 // http://doc.spip.org/@squelette_obsolete
 function squelette_obsolete($skel, $squelette) {
+	static $date_change = null;
+	// ne verifier la date de mes_fonctions et mes_options qu'une seule fois
+	// par hit
+	if (is_null($date_change)){
+		if (@spip_file_exists($fonc = 'mes_fonctions.php')
+			OR @spip_file_exists($fonc = 'mes_fonctions.php3'))
+			$date_change = @filemtime($fonc); # compatibilite
+		if (defined('_FILE_OPTIONS'))
+			$date_change = max($date_change,@filemtime(_FILE_OPTIONS));
+	}
 	return (
 		(isset($GLOBALS['var_mode']) AND in_array($GLOBALS['var_mode'], array('recalcul','preview','debug')))
 		OR !@file_exists($skel)
 		OR ((@file_exists($squelette)?@filemtime($squelette):0)
 			> ($date = @filemtime($skel)))
-		OR (
-			(@file_exists($fonc = 'mes_fonctions.php')
-			OR @file_exists($fonc = 'mes_fonctions.php3'))
-			AND @filemtime($fonc) > $date) # compatibilite
-		OR (defined('_FILE_OPTIONS') AND @filemtime(_FILE_OPTIONS) > $date)
+		OR ($date_change > $date)
 	);
 }
 
@@ -287,7 +293,7 @@ function filtre_introduction_dist($descriptif, $texte, $longueur, $connect) {
 // http://doc.spip.org/@synthetiser_balise_dynamique
 
 define('CODE_INCLURE_BALISE', '<' . '?php 
-include_once(_DIR_RACINE . "%s");
+include_once("./" . _DIR_RACINE . "%s");
 inserer_balise_dynamique(balise_%s_dyn(%s), array(%s));
 ?'
        .'>');