lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Cache to load currencies was not working when loading all currencies

Browse Source
This commit is contained in:
Laurent Destailleur 2017-04-14 18:08:02 +02:00
parent 8c07f514c8
commit 436f60a784
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/translate.class.php
View File

@ -39,7 +39,7 @@ class Translate
public $cache_labels=array(); // Cache for labels return by getLabelFromKey method public $cache_labels=array(); // Cache for labels return by getLabelFromKey method
public $cache_currencies=array(); // Cache to store currency symbols public $cache_currencies=array(); // Cache to store currency symbols
private $cache_currencies_all_loaded=false;
/** /**
@ -961,7 +961,8 @@ class Translate
{ {
global $db; global $db;
if (! empty($currency_code) && isset($this->cache_currencies[$currency_code])) return 0; // Value already into cache if ($this->cache_currencies_all_loaded) return 0; // Cache already loaded for all
if (! empty($currency_code) && isset($this->cache_currencies[$currency_code])) return 0; // Cache already loaded for the currency
$sql = "SELECT code_iso, label, unicode"; $sql = "SELECT code_iso, label, unicode";
$sql.= " FROM ".MAIN_DB_PREFIX."c_currencies"; $sql.= " FROM ".MAIN_DB_PREFIX."c_currencies";
@ -975,7 +976,7 @@ class Translate
{ {
$this->load("dict"); $this->load("dict");
$label=array(); $label=array();
foreach($this->cache_currencies as $key => $val) $label[$key]=$val['label']; if (! empty($currency_code)) foreach($this->cache_currencies as $key => $val) $label[$key]=$val['label']; // Label in already loaded cache
$num = $db->num_rows($resql); $num = $db->num_rows($resql);
$i = 0; $i = 0;
@ -989,7 +990,10 @@ class Translate
$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label']; $label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
$i++; $i++;
} }
if (empty($currency_code)) $this->cache_currencies_all_loaded=true;
//print count($label).' '.count($this->cache_currencies); //print count($label).' '.count($this->cache_currencies);
// Resort cache
array_multisort($label, SORT_ASC, $this->cache_currencies); array_multisort($label, SORT_ASC, $this->cache_currencies);
//var_dump($this->cache_currencies); $this->cache_currencies is now sorted onto label //var_dump($this->cache_currencies); $this->cache_currencies is now sorted onto label
return $num; return $num;