diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 2325acea0fe..44166666ac5 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -331,6 +331,7 @@ OtherInformationsBoxes=Other information boxes DolibarrBoard=Dolibarr board DolibarrStateBoard=Statistics DolibarrWorkBoard=Work tasks board +Available=Available NotYetAvailable=Not yet available NotAvailable=Not available Popularity=Popularity diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 42edb1411b4..70e6fcc6f7f 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -329,6 +329,7 @@ OtherInformationsBoxes=Autres boîtes d'informations DolibarrBoard=Tableau de bord DolibarrStateBoard=Statistiques DolibarrWorkBoard=Tableau de bord de travail +Available=Disponible NotYetAvailable=Pas encore disponible NotAvailable=Non disponible Popularity=Popularité diff --git a/htdocs/lib/memory.lib.php b/htdocs/lib/memory.lib.php index 924486e1aa7..116d535d116 100644 --- a/htdocs/lib/memory.lib.php +++ b/htdocs/lib/memory.lib.php @@ -48,6 +48,7 @@ function dol_setcache($memoryid,$data) // Using a memcached server if (! empty($conf->memcached->enabled) && class_exists('Memcached')) { + $memoryid=session_name().'_'.$memoryid; $m=new Memcached(); $result=$m->addServer($conf->global->MEMCACHED_SERVER, $conf->global->MEMCACHED_PORT); //$m->setOption(Memcached::OPT_COMPRESSION, false); @@ -64,6 +65,7 @@ function dol_setcache($memoryid,$data) } else if (! empty($conf->memcached->enabled) && class_exists('Memcache')) { + $memoryid=session_name().'_'.$memoryid; $m=new Memcache(); $result=$m->addServer($conf->global->MEMCACHED_SERVER, $conf->global->MEMCACHED_PORT); //$m->setOption(Memcached::OPT_COMPRESSION, false); @@ -98,6 +100,7 @@ function dol_getcache($memoryid) // Using a memcached server if (! empty($conf->memcached->enabled) && class_exists('Memcached')) { + $memoryid=session_name().'_'.$memoryid; $m=new Memcached(); $result=$m->addServer($conf->global->MEMCACHED_SERVER, $conf->global->MEMCACHED_PORT); //$m->setOption(Memcached::OPT_COMPRESSION, false); @@ -116,6 +119,7 @@ function dol_getcache($memoryid) } else if (! empty($conf->memcached->enabled) && class_exists('Memcache')) { + $memoryid=session_name().'_'.$memoryid; $m=new Memcache(); $result=$m->addServer($conf->global->MEMCACHED_SERVER, $conf->global->MEMCACHED_PORT); //$m->setOption(Memcached::OPT_COMPRESSION, false);