Merge pull request #659 from greezybacon/issue/652

forms: Better failsafe for __toString Reviewed-By: Peter Rotich <peter@osticket.com>
osTicket · Mar 6, 2014 · 0876102 · 0876102
2 parents b26f99e + 070cb4b
commit 0876102
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
@@ -729,7 +729,8 @@ function asVar() {
     }
 
     function __toString() {
-        return $this->toString();
+        $v = $this->toString();
+        return is_string($v) ? $v : (string) $this->getValue();
     }
 }