Merge branch 'master' of /home/jason/dev/git/wfpl

diff --combined template.php
index 9a3de85,36e1ad1..d54bf35
--- 1/template.php
--- 2/template.php
+++ b/template.php
@@@ -62,11 -62,6 +62,11 @@@ class tem 
                $this->keyval[$key] .= $value;
        }
  
 +      # like set() but prepends
 +      function prepend($key, $value) {
 +              $this->keyval[$key] = $value . $this->keyval[$key];
 +      }
 +
        # clear a value. Functionally equivalent to set($key, '') but cleaner and more efficient
        function clear($key) {
                unset($this->keyval[$key]);
@@@ -96,6 -91,13 +96,13 @@@
                }
        }
  
+       function show_separated($sub_template_name) {
+               if($this->get($sub_template_name)) {
+                       $this->show($sub_template_name . '_sep');
+               }
+               $this->show($sub_template_name);
+       }
+ 
        # this is used by tem::load() and should be otherwise useless
        function _load(&$in, &$out, &$parents, &$parent) {
                while($in) {
@@@ -233,11 -235,6 +240,11 @@@ function tem_append($key, $value) 
        $GLOBALS['wfpl_template']->append($key, $value);
  }
        
 +function tem_prepend($key, $value) {
 +      tem_init();
 +      $GLOBALS['wfpl_template']->prepend($key, $value);
 +}
 +      
  function tem_set($key, $value) {
        tem_init();
        $GLOBALS['wfpl_template']->set($key, $value);
@@@ -263,6 -260,12 +270,12 @@@ function tem_show($sub_template_name) 
        $GLOBALS['wfpl_template']->show($sub_template_name);
  }
  
+ function tem_show_separated($sub_template_name) {
+       tem_init();
+       $GLOBALS['wfpl_template']->show_separated($sub_template_name);
+ }
+ 
+ 
  function tem_load($filename) {
        tem_init();
        $GLOBALS['wfpl_template']->load($filename);