From 9667b6a7c6e637c670bf215f623b79822b0242d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 7 Sep 2015 20:22:44 +0200
Subject: [PATCH] Solve conflict of var name

---
 htdocs/core/lib/memory.lib.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 7df56b6283c..e8a9ac382a0 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -47,20 +47,20 @@ function dol_setcache($memoryid,$data)
 	// Using a memcached server
 	if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
 	{
-	    global $m;
-		if (empty($m) || ! is_object($m))
+	    global $dolmemcache;
+		if (empty($dolmemcache) || ! is_object($dolmemcache))
     	{
-       	    $m=new Memcached();
+       	    $dolmemcache=new Memcached();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
        		if (! $result) return -1;
        	}
        	
 	    $memoryid=session_name().'_'.$memoryid;
-		//$m->setOption(Memcached::OPT_COMPRESSION, false);
+		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
 		//print "Add memoryid=".$memoryid;
-		$m->add($memoryid,$data);    // This fails if key already exists
-		$rescode=$m->getResultCode();
+		$dolmemcache->add($memoryid,$data);    // This fails if key already exists
+		$rescode=$dolmemcache->getResultCode();
 		if ($rescode == 0)
 		{
 			return count($data);
@@ -72,18 +72,18 @@ function dol_setcache($memoryid,$data)
 	}
 	else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
 	{
-		global $m;
-		if (empty($m) || ! is_object($m))
+		global $dolmemcache;
+		if (empty($dolmemcache) || ! is_object($dolmemcache))
     	{
-       	    $m=new Memcache();
+       	    $dolmemcache=new Memcache();
        		$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
-       		$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
+       		$result=$dolmemcache->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
        		if (! $result) return -1;
        	}
 	    
        	$memoryid=session_name().'_'.$memoryid;
-		//$m->setOption(Memcached::OPT_COMPRESSION, false);
-		$result=$m->add($memoryid,$data);    // This fails if key already exists
+		//$dolmemcache->setOption(Memcached::OPT_COMPRESSION, false);
+		$result=$dolmemcache->add($memoryid,$data);    // This fails if key already exists
 		if ($result)
 		{
 			return count($data);