Merge remote-tracking branch 'upstream/develop' into camelCaps

htdocs/core/class/html.formmail.class.php

@@ -35,7 +35,10 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php';
  */
 class FormMail extends Form
 {
-	var $db;
+	/**
+     * @var DoliDB Database handler.
+     */
+    public $db;
 
 	var $withform;				// 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button
 
@@ -85,7 +88,10 @@ class FormMail extends Form
 	public $withtouser=array();
 	public $withtoccuser=array();
 
-	var $error;
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error='';
 
 	public $lines_model;