X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=template.php;h=cbb9466f18d01ef7eed3e17a3a47f7f3a18583d4;hb=7b104a1fadfd6033dc7d08c0cf9fb494ec10266d;hp=90a253347f79af16fbfe5a8777764af17e7664cd;hpb=e8eec562c1b6d3420c3d035c9abdd1303cfbba23;p=wfpl.git diff --git a/template.php b/template.php index 90a2533..cbb9466 100644 --- a/template.php +++ b/template.php @@ -300,34 +300,34 @@ function merge_templates(&$main, &$tem) { function tem_auto_sep(&$value, $key, $context) { $rows =& $context['parent']['parent']; if($rows['cur'] != count($rows['rows'])-1) # last row? - return $value = true; # show once + return true; # show once } # auto-show once, only when this is the first row of the parent function tem_auto_last(&$value, $key, $context) { $rows =& $context['parent']['parent']; if($rows['cur'] == count($rows['rows'])-1) # last row? - return $value = true; # show once + return true; # show once } # auto-show once, only when this is the last row of the parent function tem_auto_first(&$value, $key, $context) { $rows =& $context['parent']['parent']; if($rows['cur'] == 0) # first row? - return $value = true; # show once + return true; # show once } # 'show' sections will be shown unless the corresponding data # value === false function tem_auto_show(&$value) { - if($value === null) $value = array(array()); + if($value === null) return true; return $value; } # 'nonempty' sections will not be shown if the corresponding data # value is the empty string function tem_auto_nonempty(&$value) { - if($value === '') $value = null; + if($value === '') return null; return $value; } @@ -335,11 +335,10 @@ function tem_auto_nonempty(&$value) { # value is not set (opposite of default) function tem_auto_unset(&$value) { if($value === null) { - $value = ''; + return ''; } else { - $value = null; + return null; } - return $value; } # 'evenodd' sections are given an 'evenodd' attribute whose value @@ -405,7 +404,7 @@ class tem { $this->data = array(); } - function set($key, $value) { + function set($key, $value = true) { $this->data[$key] = $value; } @@ -524,7 +523,7 @@ function tem_prepend($key, $value) { $GLOBALS['wfpl_template']->prepend($key, $value); } -function tem_set($key, $value) { +function tem_set($key, $value = true) { tem_init(); $GLOBALS['wfpl_template']->set($key, $value); }