Changeset 103910 in spip-zone

Timestamp:

Apr 11, 2017, 11:36:01 AM (4 years ago)

Author:

marcimat@…

Message:

Suite de r103909 : Éviter du coup aussi d'ajouter fr/ sur des appels '?page=xx' ou 'spip.php?page=xx' …

Location:

_plugins_/domlang/trunk

Files:

• paquet.xml (modified) (1 diff)
• urls/arbodom.php (modified) (1 diff)

_plugins_/domlang/trunk/paquet.xml

@@ -2 +2 @@
         prefix="domlang"
         categorie="navigation"
-        version="1.0.1"
+        version="1.0.2"
         etat="test"
         compatibilite="[3.1.0;3.2.*]"

_plugins_/domlang/trunk/urls/arbodom.php

@@ -65 +65 @@
                 parse_str($contexte, $contexte);
         }
-        if (!empty($args['lang']) and strpos($i, '/') === false) {
+        if (
+                !empty($args['lang'])
+                and $url_propre = preg_replace(',[?].*,', '', $i)
+                and strpos($url_propre, '/') === false
+                and !preg_match(',^.*[.]php,', $url_propre)
+        ) {
                 $i2 = $args['lang'] . '/' . $i;
                 $change = true;