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/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -26,8 +26,15 @@
 */
 class RssParser
 {
-    var $db;
-    var $error;
+    /**
+     * @var DoliDB Database handler.
+     */
+    public $db;
+    
+    /**
+	 * @var string Error code (or message)
+	 */
+	public $error='';

    private $_format='';
    private $_urlRSS;