HTML_Template_HIT:

[software/bife/bife-all.git] / src / BIFE / Generic.php

diff --git a/src/BIFE/Generic.php b/src/BIFE/Generic.php
index 296a4c8213b57dedb9edb9c97885c24728727caf..bbda5bdc52cc6256ee46461395d6c9182a7a541b 100644 (file)
--- a/src/BIFE/Generic.php
+++ b/src/BIFE/Generic.php
@@ -26,7 +26,6 @@
 // $Id$
 //
 
-
 // +X2C includes
 require_once 'BIFE/Container.php';
 // ~X2C
@@ -39,14 +38,6 @@ require_once 'BIFE/Container.php';
  * @abstract
  */
 class BIFE_Generic extends BIFE_Container {
-    /**
-     * Attribute list.
-     *
-     * @var    array $attrs
-     * @access public
-     */
-    var $attrs;
-
     // ~X2C
 
     // +X2C Operation 10
@@ -75,14 +66,13 @@ class BIFE_Generic extends BIFE_Container {
      */
     function __construct($attrs) // ~X2C
     {
-        parent::__construct();
-        $this->attrs = $attrs;
+        parent::__construct($attrs);
     }
     // -X2C
 
     // +X2C Operation 11
     /**
-     * Add contents to the widget.
+     * Add contents to the container.
      *
      * @param  mixed &$contents Contents to add.
      *
@@ -104,18 +94,18 @@ class BIFE_Generic extends BIFE_Container {
     /**
      * Renders the widget.
      *
-     * @param  HTML_Template_Sigma &$template Template to use to render the widget.
+     * @param  HTML_Template_HIT &$template Template to use to render the widget.
      *
      * @return string
      * @access public
      */
     function render(&$template) // ~X2C
     {
-        $contents = parent::render($template);
-        $template->loadTemplateFile(get_class($this).'.html');
-        $template->setVariable($this->attrs);
-        $template->setVariable('CONTENTS', $contents);
-        return $template->get();
+        $this->attrs['CONTENTS'] = parent::render($template);
+        $template->setGroup();
+        $out = $template->parse(get_class($this), $this->attrs);
+        $template->unsetGroup();
+        return $out;
     }
     // -X2C