From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 3 Feb 2018 16:59:43 +0000 (-0500)
Subject: Merge branch 'develop' into task/3878-move-session-to-src
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=876acd68a0c6f7384c5aa0c78553dd70cd32bd99;p=friendica.git

Merge branch 'develop' into task/3878-move-session-to-src
---

876acd68a0c6f7384c5aa0c78553dd70cd32bd99
diff --cc src/Core/Cache.php
index 1f3c9e82f0,36db52b0e0..70a9b9f292
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@@ -22,7 -24,7 +24,7 @@@ class Cach
  	 */
  	public static function memcache()
  	{
- 		if (!class_exists('\Memcache', false)) {
 -		if (!function_exists('memcache_connect')) {
++		if (!class_exists('Memcache', false)) {
  			return false;
  		}
  
@@@ -33,7 -35,7 +35,7 @@@
  		$memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
  		$memcache_port = Config::get('system', 'memcache_port', 11211);
  
- 		$memcache = new \Memcache();
 -		$memcache = new Memcache;
++		$memcache = new Memcache();
  
  		if (!$memcache->connect($memcache_host, $memcache_port)) {
  			return false;