Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2017-10-02 12:20:18 +02:00
commit a23065c3df

View File

@ -399,6 +399,7 @@ class User extends CommonObject
} }
} }
// Sort by key, so _noquery_ is last // Sort by key, so _noquery_ is last
if(!empty($this->default_values)) {
foreach($this->default_values as $a => $b) foreach($this->default_values as $a => $b)
{ {
foreach($b as $c => $d) foreach($b as $c => $d)
@ -406,6 +407,7 @@ class User extends CommonObject
krsort($this->default_values[$a][$c]); krsort($this->default_values[$a][$c]);
} }
} }
}
$this->db->free($resql); $this->db->free($resql);
} }
else else