Se pone el nuevo metodo addPager() en una subclase.

[mecon/meconlib.git] / lib / MECON / HTML / Link.php

diff --git a/lib/MECON/HTML/Link.php b/lib/MECON/HTML/Link.php
index 31e22bd9a538870d85c54e28a92a437e1c61962a..4d97b3407e3ec61b7bb41547b167cb29ed71807f 100644 (file)
--- a/lib/MECON/HTML/Link.php
+++ b/lib/MECON/HTML/Link.php
@@ -24,7 +24,9 @@ Autor:  @@author <@@email>
 $Id$
 -----------------------------------------------------------------------------*/
 
-
+// +X2C includes
+require_once 'HTML/Common.php';
+// ~X2C
 
 // +X2C Class 892 :MECON_HTML_Link
 /**
@@ -124,10 +126,12 @@ class MECON_HTML_Link extends HTML_Common {
                     $vars[] = urlencode($var) . '=' . urlencode($v);
                 }
                 if ($vars) {
-                    $val = '?' . join('&', $vars);
+                    $val .= '?' . join('&', $vars);
                 }
+            } else {
+                $val = htmlentities($val);
             }
-            $attrs .= ' ' . $key . '="' . htmlentities($val) . '"';
+            $attrs .= ' ' . $key . '="' . $val . '"';
         }
         return "<A$attrs>" . $this->getContents() . '</A>';
     }
@@ -174,9 +178,9 @@ class MECON_HTML_Link extends HTML_Common {
     function setGetVar($key, &$value) // ~X2C
     {
         if (is_object($value)) {
-            $this->attrs[$key] =& $value;
+            $this->_getVars[$key] =& $value;
         } else {
-            $this->attrs[$key] = $value;
+            $this->_getVars[$key] = $value;
         }
     }
     // -X2C
@@ -224,13 +228,9 @@ If they doesn't exists, they are added, if they exists, they are updated.
      * @return void
      * @access public
      */
-    function addContents(&$contents) // ~X2C
+    function addContents($contents) // ~X2C
     {
-        if (is_object($contents)) {
-            $this->_contents[] =& $contents;
-        } else {
-            $this->_contents[] = $contents;
-        }
+        $this->_contents[] = $contents;
     }
     // -X2C
 
@@ -262,9 +262,10 @@ If they doesn't exists, they are added, if they exists, they are updated.
      */
     function setContents($contents) // ~X2C
     {
-        $this->_contents = $contents;
+        $this->_contents = array($contents);
     }
     // -X2C
 
 } // -X2C Class :MECON_HTML_Link
+
 ?>
\ No newline at end of file