diff --git a/lam/lib/html.inc b/lam/lib/html.inc
index 24bba64e..42b97d37 100644
--- a/lam/lib/html.inc
+++ b/lam/lib/html.inc
@@ -2671,7 +2671,7 @@ class htmlSubTitle extends htmlElement {
echo "
\n";
echo "
\n";
if ($this->image != null) {
- echo ' ';
+ echo ' ';
}
echo $this->label;
echo "
\n";
@@ -2733,7 +2733,7 @@ class htmlLink extends htmlElement {
/** link text */
private $text = null;
/** link target */
- private $target = null;
+ protected $target = null;
/** optional image */
private $image = null;
/** title */
@@ -2774,7 +2774,7 @@ class htmlLink extends htmlElement {
function generateHTML($module, $input, $values, $restricted, &$tabindex, $scope) {
$image = '';
if ($this->image != null) {
- $image = '
';
+ $image = '
';
}
$title = '';
if ($this->title != null) {
@@ -2797,7 +2797,7 @@ class htmlLink extends htmlElement {
if (sizeof($this->cssClasses) > 0) {
$classAttr = ' class="' . implode(' ', $this->cssClasses) . '"';
}
- echo '
' . $image . $this->text . '';
+ echo '
' . $image . $this->getContent() . '';
if ($this->showAsButton) {
echo '