diff --git a/ecrire/public.php b/ecrire/public.php index 7bb197d0db80ece68104f13497efb2d826cb619d..1c16c94ba6c5dc5378c011fe5582516f53ea03cc 100644 --- a/ecrire/public.php +++ b/ecrire/public.php @@ -62,8 +62,8 @@ if (isset($GLOBALS['_INC_PUBLIC'])) { erreur_upload_trop_gros(); } - // mais plus probablement nous sommes dans le cas - $fond = 'sommaire'; + // sinon fond par defaut (cf. assembler.php) + $fond = ''; } $tableau_des_erreurs = $tableau_des_temps = array(); diff --git a/ecrire/public/assembler.php b/ecrire/public/assembler.php index bee18cf69a82c84232b7f4c7128cd15878d8a17b..99d10a3b153500fd0cc2357c21110dd58ba392e1 100644 --- a/ecrire/public/assembler.php +++ b/ecrire/public/assembler.php @@ -87,7 +87,7 @@ function assembler($fond, $connect='') { $url = nettoyer_uri(); $a = $renommer($url, $fond); if (is_array($a)) { - list($ncontexte, $nfond, $url_redirect) = $a; + list($ncontexte, $type, $url_redirect, $nfond) = $a; if (isset($url_redirect) AND $url !== $url_redirect) { spip_log("Redirige $url vers $url_redirect"); @@ -97,20 +97,27 @@ function assembler($fond, $connect='') { } if (isset($nfond)) $fond = $nfond; + else if ($fond == '' + OR $fond == 'type_urls' /* compat avec htaccess 2.0.0 */ + ) + $fond = ($type === 'syndic') ? 'site' : $type; if (isset($ncontexte)) $contexte = $ncontexte; } } + // compatibilite <= 1.9.2 elseif (function_exists('recuperer_parametres_url')) - // compatibilite <= 1.9.2 recuperer_parametres_url($fond, nettoyer_uri()); + + + // squelette par defaut + if (!strlen($fond)) + $fond = 'sommaire'; + + // preparer le contexte $parametrer = charger_fonction('parametrer', 'public'); $page = $parametrer($fond, $GLOBALS['contexte'], $chemin_cache, $connect); - // Ajouter les scripts avant de mettre en cache - $page['insert_js_fichier'] = pipeline("insert_js",array("type" => "fichier","data" => array())); - $page['insert_js_inline'] = pipeline("insert_js",array("type" => "inline","data" => array())); - // Stocker le cache sur le disque if ($chemin_cache) $cacher(NULL, $use_cache, $chemin_cache, $page, $lastmodified); diff --git a/ecrire/urls/arbo.php b/ecrire/urls/arbo.php index a3b28ac6f2d12cc462373a69b3170099e486e12e..b56852df690a9856050ba8a630ec6b1aca0e9637 100644 --- a/ecrire/urls/arbo.php +++ b/ecrire/urls/arbo.php @@ -401,7 +401,7 @@ function _generer_url_arbo($type, $id, $args='', $ancre='') { } -// @return array([contexte],[fond],[url_redirect]) : url decodee +// @return array([contexte],[type],[url_redirect],[fond]) : url decodee // http://doc.spip.org/@urls_arbo_dist function urls_arbo_dist($i, $entite, $args='', $ancre='') { if (is_numeric($i)) diff --git a/ecrire/urls/propres.php b/ecrire/urls/propres.php index cd52b63007b4ae0cbc94b86ba005f88fd790e0cc..ef42ff3b358bb62f5f387d2e18e4d06bdb778728 100644 --- a/ecrire/urls/propres.php +++ b/ecrire/urls/propres.php @@ -318,7 +318,7 @@ function _generer_url_propre($type, $id, $args='', $ancre='') { // retrouve le fond et les parametres d'une URL propre // ou produit une URL propre si on donne un parametre -// @return array([contexte],[fond],[url_redirect]) : url decodee +// @return array([contexte],[type],[url_redirect],[fond]) : url decodee // http://doc.spip.org/@urls_propres_dist function urls_propres_dist($i, $entite, $args='', $ancre='') { diff --git a/htaccess.txt b/htaccess.txt index 3632e0e58b88f1bfcba3d3b2d287407c08cdb3f8..a844e51ceb2ba83d86533016f25c5cc4136916ce 100644 --- a/htaccess.txt +++ b/htaccess.txt @@ -85,7 +85,7 @@ RewriteRule ^spip_rss\.php3?$ spip.php?page=rss [QSA,L] ### # URLs "propres", "propres2", "libres", "arbo" -RewriteRule ^[^\.]+(\.html)?$ spip.php?page=type_urls [QSA,E=url_propre:$0,L] +RewriteRule ^[^\.]+(\.html)?$ spip.php [QSA,E=url_propre:$0,L] # Fin URLs "propres" et "propres2" ###