]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'develop' into task/3878-move-session-to-src
authorHypolite Petovan <mrpetovan@gmail.com>
Sat, 3 Feb 2018 16:59:43 +0000 (11:59 -0500)
committerGitHub <noreply@github.com>
Sat, 3 Feb 2018 16:59:43 +0000 (11:59 -0500)
1  2 
boot.php
src/Core/Cache.php

diff --cc boot.php
Simple merge
index 1f3c9e82f02b1ebd5689b45c83bc312c9abf81c3,36db52b0e054170a73480ddf31825e2db53db680..70a9b9f292607489948a55c8f58a7c267bd4b6f8
@@@ -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;