Merge remote branch 'upstream/master' into BUG-9508

2012-10-04 15:25:38 -04:00
parent e175087c82 65e75911c9
commit 1d8b2671c1
36 changed files with 1315 additions and 452 deletions
--- a/gulliver/system/class.xmlform.php
+++ b/gulliver/system/class.xmlform.php
@@ -2264,6 +2264,7 @@ class XmlForm_Field_Link extends XmlForm_Field {
    $html   .= (($this->onclick) ? ' onclick="' . htmlentities ( $onclick, ENT_QUOTES, 'utf-8' ) . '"' : '') ;
    $html   .= (($this->target) ? ' target="' . htmlentities ( $target, ENT_QUOTES, 'utf-8' ) . '"' : '') . '>';
    $html   .= $this->htmlentities ( $this->value === '' ? $label : $value, ENT_QUOTES, 'utf-8' ) . '</a>';
+    $html   .= $this->renderHint();
    return $html;
  }