X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=template.php;h=c1df1c1c1206c9b5870ea83a8af27bbf23077bc6;hb=dfb559a8ce4e04d8e5f27f8587141e97f9af1a59;hp=7539a19dcb387b89c02f40eb5c1119f94dbf2514;hpb=203b704003fa9bfbe823e5ebc8d8e7cff919a073;p=wfpl.git diff --git a/template.php b/template.php index 7539a19..c1df1c1 100644 --- a/template.php +++ b/template.php @@ -1,19 +1,9 @@ -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# This program is in the public domain within the United States. Additionally, +# we waive copyright and related rights in the work worldwide through the CC0 +# 1.0 Universal public domain dedication, which can be found at +# http://creativecommons.org/publicdomain/zero/1.0/ # This is a simple template-handling system. You pass it a big data @@ -248,11 +238,11 @@ function tem_encoded_data($tag, $context) function is_sub_template(&$piece) { - return is_array($piece) and $piece['pieces']; + return is_array($piece) && isset($piece['pieces']); } function is_value_slot(&$piece) { - return is_array($piece) and !$piece['pieces']; + return is_array($piece) && !isset($piece['pieces']); } # Return a hash containing the top-level sub-templates of tem. @@ -457,6 +447,9 @@ class tem { } function append($key, $value) { + if (!isset($this->data[$key])) { + $this->data[$key] = ''; + } $this->data[$key] .= $value; } @@ -475,6 +468,9 @@ class tem { function show($name) { $tem = tem_is_old_sub($name, $this->template); if($tem) { + if (!isset($this->data[$name])) { + $this->data[$name] = ''; + } $this->data[$name] .= fill_template($tem, $this->data); } } @@ -636,5 +632,3 @@ function tem_load_new($filename) { function tem_sub($name) { tem_show($name); } - -?>