(no commit message)

diff --git a/lib/MECON/Marco.php b/lib/MECON/Marco.php
index 9f29747483cd625353fa0d948162eec79cffb86e..0b0ead5f2c2ea1fec409d8472ea87e4eb35bf7db 100644 (file)
--- a/lib/MECON/Marco.php
+++ b/lib/MECON/Marco.php
@@ -275,7 +275,7 @@ class Marco extends HTML_Page {
      */
     function _body_display() // ~X2C
     {
      */
     function _body_display() // ~X2C
     {

-        $this->_contenido[] = '<br>';
+        $this->_contenido[] = '<br>&nbsp;';

         $body = array ( 'copete' => $this->_copete->toHtml(),
                         'body'   => $this->_contenido,
                         'pie'    => $this->_pie->toHtml(),
         $body = array ( 'copete' => $this->_copete->toHtml(),
                         'body'   => $this->_contenido,
                         'pie'    => $this->_pie->toHtml(),

diff --git a/lib/MECON/Marco/MenuOculto.php b/lib/MECON/Marco/MenuOculto.php
index 09f9483c9bb3955bebac3f4ee55f59e6ae57fe93..4fdc8071d92b739b94aa1829357eb69abd41045c 100644 (file)
--- a/lib/MECON/Marco/MenuOculto.php
+++ b/lib/MECON/Marco/MenuOculto.php
@@ -86,6 +86,7 @@ class MenuOculto extends Menu {
                 $tmp.=$bod;
             }
         }
                 $tmp.=$bod;
             }
         }

+        

         $row = array ($tmp);
         $this->_tabla->addRow($row,'align="center" bgcolor="#FFFFFF"');
     }
         $row = array ($tmp);
         $this->_tabla->addRow($row,'align="center" bgcolor="#FFFFFF"');
     }

diff --git a/lib/MECON/Marco/MenuPrincipal.php b/lib/MECON/Marco/MenuPrincipal.php
index 71f8c543ad75a01c3ab99ccc1808a7c7b1197c1d..360424fff9f5b90877d1965860a28f8d3cb2c2f0 100644 (file)
--- a/lib/MECON/Marco/MenuPrincipal.php
+++ b/lib/MECON/Marco/MenuPrincipal.php
@@ -108,8 +108,28 @@ class MenuPrincipal extends MenuHorizontal {
             $row = array ($this->_seccionSeleccionada->_hijos->toHtml());
         }
         else {
             $row = array ($this->_seccionSeleccionada->_hijos->toHtml());
         }
         else {

-            $row = array ($body['body']);
+            if (is_array($body['body'])) {
+                $tmp = '';
+                foreach ($body['body'] as $bod) {
+                    if (is_object($bod)) {
+                        if (method_exists($bod,'toHtml')) {
+                            $tmp.=$bod->toHtml();
+                        }
+                        else {
+                        trigger_error('El metodo no existe! - '.get_class($bod).'::toHtml()', E_USER_WARNING);
+                        }
+                    }
+                    else {
+                        $tmp.=$bod;
+                    }
+                }
+                $row = array ($tmp);
+            }
+            else {
+                $row = array ($body['body']);
+            }

         }
         }

+        

         $this->_tabla->addRow($row,'align="center" bgcolor="#FFFFFF" colspan="'.$colspan.'"');
 
         $row = array ($body['pie']);
         $this->_tabla->addRow($row,'align="center" bgcolor="#FFFFFF" colspan="'.$colspan.'"');
 
         $row = array ($body['pie']);