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

2018-08-28 09:34:53 +02:00
parent d8bf4a0ecf 50d50c2e10
commit fe4260a014
335 changed files with 3278 additions and 1248 deletions
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -37,7 +37,11 @@ class mailing_example extends MailingTargets

    var $require_module=array();
    var $picto='';
-    var $db;
+    
+    /**
+     * @var DoliDB Database handler.
+     */
+    public $db;


    // CHANGE THIS: Constructor name must be called mailing_xxx with xxx=name of your selector