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,12 +399,14 @@ class User extends CommonObject
}
}
// Sort by key, so _noquery_ is last
foreach($this->default_values as $a => $b)
{
foreach($b as $c => $d)
{
krsort($this->default_values[$a][$c]);
}
if(!empty($this->default_values)) {
foreach($this->default_values as $a => $b)
{
foreach($b as $c => $d)
{
krsort($this->default_values[$a][$c]);
}
}
}
$this->db->free($resql);
}