Merge remote branch 'origin/master' into translation-staging

This commit is contained in:
TeamCity 2012-09-26 22:36:55 +12:00
commit 6a263eb98e
2 changed files with 2 additions and 2 deletions

View File

@ -125,7 +125,7 @@ class FormField extends RequestHandler {
*/
public function __construct($name, $title = null, $value = null) {
$this->name = $name;
$this->title = ($title === null) ? $name : $title;
$this->title = ($title === null) ? self::name_to_label($name) : $title;
if($value !== NULL) $this->setValue($value);