mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-06 16:53:34 +02:00
This fix was initially only for branch 2.9, and branch master should have received a new version of jshrink, but I forgot to do it before 2.10 and now we have a regression in 2.10. This commit will be cherry-picked to 2.10 and we also have it on master so that we don't have a new regression in 2.11 (in case jshrink is not properly updated)
This commit is contained in:
@@ -192,7 +192,7 @@ class JShrink_Minifier
|
|||||||
case "\n":
|
case "\n":
|
||||||
// if the next line is something that can't stand alone
|
// if the next line is something that can't stand alone
|
||||||
// preserve the newline
|
// preserve the newline
|
||||||
if(strpos('(-+{[@', $this->b) !== false)
|
if($this->b !== false && strpos('(-+{[@', $this->b) !== false)
|
||||||
{
|
{
|
||||||
echo $this->a;
|
echo $this->a;
|
||||||
$this->saveString();
|
$this->saveString();
|
||||||
@@ -239,7 +239,7 @@ class JShrink_Minifier
|
|||||||
if($this->a == '/' && ($this->b == '\'' || $this->b == '"'))
|
if($this->a == '/' && ($this->b == '\'' || $this->b == '"'))
|
||||||
{
|
{
|
||||||
$this->saveRegex();
|
$this->saveRegex();
|
||||||
continue;
|
continue 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
echo $this->a;
|
echo $this->a;
|
||||||
|
|||||||
Reference in New Issue
Block a user