Merge branch '8.0' of [email protected]:Dolibarr/dolibarr.git into 9.0

Conflicts: htdocs/core/modules/DolibarrModules.class.php
Dolibarr · Mar 5, 2019 · d18a585 · d18a585
2 parents 28a4217 + 98f5bb2
commit d18a585
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
@@ -880,24 +880,28 @@ function getImportDatasetLabel($r)
     /**
      * Gives the last date of activation
      *
-     * @return timestamp       Date of last activation
+     * @return timestamp|string       Date of last activation
      */
     function getLastActivationDate()
     {
         global $conf;
 
+        $err = 0;
+
         $sql = "SELECT tms FROM ".MAIN_DB_PREFIX."const";
         $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
         $sql.= " AND entity IN (0, ".$conf->entity.")";
 
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
         $resql=$this->db->query($sql);
-        if (! $resql) { $err++;
-        } else
+        if (! $resql)
+        {
+            $err++;
+        }
+        else
         {
             $obj=$this->db->fetch_object($resql);
-            if ($obj) { return $this->db->jdate($obj->tms);
-            }
+            if ($obj) { return $this->db->jdate($obj->tms); }
         }
 
         return '';
@@ -913,14 +917,19 @@ function getLastActivationInfo()
     {
         global $conf;
 
-        $sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
-        $sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
-        $sql.= " AND entity IN (0, ".$conf->entity.")";
+        $err = 0;
+
+		$sql = "SELECT tms, note FROM ".MAIN_DB_PREFIX."const";
+		$sql.= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($this->const_name)."'";
+		$sql.= " AND entity IN (0, ".$conf->entity.")";
 
         dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
         $resql=$this->db->query($sql);
-        if (! $resql) { $err++;
-        } else
+        if (! $resql)
+        {
+            $err++;
+        }
+        else
         {
             $obj=$this->db->fetch_object($resql);
             $tmp=array();