diff --git a/.gitattributes b/.gitattributes index 97d36340df95d24a5cc3749d4ddef0c5d7bb78c2..4fad5690ac606662b376aeeab210031aa575398e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -639,7 +639,7 @@ ecrire/lang/spip_cs.php -text ecrire/lang/spip_id.php -text ecrire/lang/spip_it_fem.php -text ecrire/lang/spip_ru.php -text -ecrire/lib/class.JavaScriptPacker.php -text +ecrire/lib/JavaScriptPacker/class.JavaScriptPacker.php -text ecrire/lib/safehtml/classes/HTMLSax3.php -text ecrire/lib/safehtml/classes/HTMLSax3/Decorators.php -text ecrire/lib/safehtml/classes/HTMLSax3/States.php -text diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php index 523fc32f47e4f7753707467723f1b67517a569ae..934e5d2138dc0a943559295f3849072dfd23d435 100644 --- a/ecrire/inc/filtres.php +++ b/ecrire/inc/filtres.php @@ -1987,7 +1987,7 @@ function charge_scripts($scripts) { function compacte_js($flux) { if (!strlen($flux)) return $flux; - include_spip('lib/class.JavaScriptPacker'); + include_spip('lib/JavaScriptPacker/class.JavaScriptPacker'); $packer = new JavaScriptPacker($flux, 0, true, false); // en cas d'echec (?) renvoyer l'original diff --git a/ecrire/lib/class.JavaScriptPacker.php b/ecrire/lib/JavaScriptPacker/class.JavaScriptPacker.php similarity index 100% rename from ecrire/lib/class.JavaScriptPacker.php rename to ecrire/lib/JavaScriptPacker/class.JavaScriptPacker.php