X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flibs%2Fjsminplus.php;h=08e9d690db26c9fe255ddd2969c5ebaaa00bcc03;hb=2e5d114a99cf162074f92fc390590da44084362d;hp=7feac7d11a925afb157ec26532a872f1e9e49ecb;hpb=85ac1b5d7c7ca50a93f2d16639cdde2f46bc133e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/jsminplus.php b/includes/libs/jsminplus.php index 7feac7d11a..08e9d690db 100644 --- a/includes/libs/jsminplus.php +++ b/includes/libs/jsminplus.php @@ -1,5 +1,5 @@ setup = $n2 ? $n2 : null; + $n->setup = $n2 ?: null; $this->t->mustMatch(OP_SEMICOLON); $n->condition = $this->t->peek() == OP_SEMICOLON ? null : $this->Expression($x); $this->t->mustMatch(OP_SEMICOLON); @@ -1656,7 +1656,7 @@ class JSNode { if ($token = $t->currentToken()) { - $this->type = $type ? $type : $token->type; + $this->type = $type ?: $token->type; $this->value = $token->value; $this->lineno = $token->lineno; $this->start = $token->start; @@ -1752,7 +1752,7 @@ class JSTokenizer public function init($source, $filename = '', $lineno = 1) { $this->source = $source; - $this->filename = $filename ? $filename : '[inline]'; + $this->filename = $filename ?: '[inline]'; $this->lineno = $lineno; $this->cursor = 0;