X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=www%2Fplugins-dist%2Fcompresseur%2Flib%2FJavascriptPacker%2Fclass.JavaScriptPacker.php;h=31c86b0244adda8b5901057f908be6f0573dd88b;hb=77a53a65e59f60f4d49b41f1b82d72830ba68987;hp=9164ae289c9ecd23ed7ca9245e3058d5400902bb;hpb=9a3d4353e89ac94da6b21cff26e28fa704369cb2;p=lhc%2Fweb%2Fwww.git

diff --git a/www/plugins-dist/compresseur/lib/JavascriptPacker/class.JavaScriptPacker.php b/www/plugins-dist/compresseur/lib/JavascriptPacker/class.JavaScriptPacker.php
index 9164ae28..31c86b02 100644
--- a/www/plugins-dist/compresseur/lib/JavascriptPacker/class.JavaScriptPacker.php
+++ b/www/plugins-dist/compresseur/lib/JavascriptPacker/class.JavaScriptPacker.php
@@ -724,7 +724,6 @@ class ParseMaster {
 // https://code.spip.net/@_escape
 	function _escape($string, $escapeChar) {
 		if ($escapeChar) {
-			$this->buffer = $escapeChar;
 			return preg_replace_callback(
 				'/\\' . $escapeChar . '(.)' .'/',
 				array(&$this, '_escapeBis'),
@@ -737,16 +736,15 @@ class ParseMaster {
 	}
 // https://code.spip.net/@_escapeBis
 	function _escapeBis($match) {
-		$this->_escaped[] = $match[1];
-		return $this->buffer;
+		$this->_escaped[] = $match[0];
+		return "@@@@AVECDELACROUTE".(count($this->_escaped)-1)."@@@@";
 	}
 
 	// decode escaped characters
 // https://code.spip.net/@_unescape
 	function _unescape($string, $escapeChar) {
 		if ($escapeChar) {
-			$regexp = '/'.'\\'.$escapeChar.'/';
-			$this->buffer = array('escapeChar'=> $escapeChar, 'i' => 0);
+			$regexp = '/@@@@AVECDELACROUTE(\d+)@@@@/';
 			return preg_replace_callback
 			(
 				$regexp,
@@ -759,16 +757,8 @@ class ParseMaster {
 		}
 	}
 // https://code.spip.net/@_unescapeBis
-	function _unescapeBis() {
-		if (isset($this->_escaped[$this->buffer['i']])
-			&& $this->_escaped[$this->buffer['i']] != '')
-		{
-			 $temp = $this->_escaped[$this->buffer['i']];
-		} else {
-			$temp = '';
-		}
-		$this->buffer['i']++;
-		return $this->buffer['escapeChar'] . $temp;
+	function _unescapeBis($r) {
+		return $this->_escaped[$r[1]];
 	}
 
 // https://code.spip.net/@_internalEscape