|
@@ -52,7 +52,7 @@ discard block |
|
|
block discarded – undo |
|
52
|
52
|
|
|
53
|
53
|
public $compile_id = null; |
|
54
|
54
|
|
|
55
|
|
- public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id. |
|
|
55
|
+ public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id. |
|
56
|
56
|
|
|
57
|
57
|
public string $title = ''; |
|
58
|
58
|
|
|
@@ -492,7 +492,7 @@ discard block |
|
|
block discarded – undo |
|
492
|
492
|
|
|
493
|
493
|
$args = func_get_args(); |
|
494
|
494
|
unset($args[0]); |
|
495
|
|
- for ($i = 1; isset($args[$i]); $i ++) { |
|
|
495
|
+ for ($i = 1; isset($args[$i]); $i++) { |
|
496
|
496
|
$this->assign('p' . $i, $args[$i]); |
|
497
|
497
|
} |
|
498
|
498
|
|
|
@@ -794,7 +794,7 @@ discard block |
|
|
block discarded – undo |
|
794
|
794
|
// |foo|bar |
|
795
|
795
|
// |foo:$foo->bar |
|
796
|
796
|
$this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|' |
|
797
|
|
- . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)'; |
|
|
797
|
+ . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp . '))*)'; |
|
798
|
798
|
|
|
799
|
799
|
// matches valid function name: |
|
800
|
800
|
// foo123 |
|
@@ -815,7 +815,7 @@ discard block |
|
|
block discarded – undo |
|
815
|
815
|
// "text"|bar |
|
816
|
816
|
// $foo->bar |
|
817
|
817
|
$this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|' |
|
818
|
|
- . $this->_var_regexp . '|' . $this->_num_const_regexp . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)'; |
|
|
818
|
+ . $this->_var_regexp . '|' . $this->_num_const_regexp . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)'; |
|
819
|
819
|
|
|
820
|
820
|
// matches valid parenthesised function parameters: |
|
821
|
821
|
// |
Please login to merge, or discard this patch.