- Added experimental phing build file.

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

diff --git a/src/BIFE/Generic.php b/src/BIFE/Generic.php
index 1cca6451eeb989ad7734786292a3b345cc35c6e5..c98bc49d09ac6e2bba2fabbbd7fa2869088aeeb0 100644 (file)
--- a/src/BIFE/Generic.php
+++ b/src/BIFE/Generic.php
@@ -26,7 +26,6 @@
 // $Id$
 //
 
 // $Id$
 //
 

-

 // +X2C includes
 require_once 'BIFE/Container.php';
 // ~X2C
 // +X2C includes
 require_once 'BIFE/Container.php';
 // ~X2C


@@ -43,7 +42,7 @@ class BIFE_Generic extends BIFE_Container {
      * Attribute list.
      *
      * @var    array $attrs
      * Attribute list.
      *
      * @var    array $attrs

-     * @access public
+     * @access protected

      */
     var $attrs;
 
      */
     var $attrs;
 


@@ -82,7 +81,7 @@ class BIFE_Generic extends BIFE_Container {
 
     // +X2C Operation 11
     /**
 
     // +X2C Operation 11
     /**

-     * Add contents to the widget.
+     * Add contents to the container.

      *
      * @param  mixed &$contents Contents to add.
      *
      *
      * @param  mixed &$contents Contents to add.
      *


@@ -94,7 +93,9 @@ class BIFE_Generic extends BIFE_Container {
         if (is_string($contents)) {
             $contents = trim($contents);
         }
         if (is_string($contents)) {
             $contents = trim($contents);
         }

-        parent::addContents($contents);
+        if ($contents) {
+            parent::addContents($contents);
+        }

     }
     // -X2C
 
     }
     // -X2C
 


@@ -109,13 +110,14 @@ class BIFE_Generic extends BIFE_Container {
      */
     function render(&$template) // ~X2C
     {
      */
     function render(&$template) // ~X2C
     {

+        $contents = parent::render($template);

         $template->loadTemplateFile(get_class($this).'.html');
         $template->setVariable($this->attrs);
         $template->loadTemplateFile(get_class($this).'.html');
         $template->setVariable($this->attrs);

-        $template->setVariable('CONTENTS', parent::render($template));
+        $template->setVariable('CONTENTS', $contents);

         return $template->get();
     }
     // -X2C
 
 } // -X2C Class :Generic
 
         return $template->get();
     }
     // -X2C
 
 } // -X2C Class :Generic
 

-?>
+?>
\ No newline at end of file