From 7a6089b79a9b553e31cdcf74a25c70f9c3aede4f Mon Sep 17 00:00:00 2001 From: xisi Date: Tue, 18 Nov 2014 05:15:57 -0500 Subject: [PATCH] More stringent check for enabling, removed superfluous die --- include/admin_checks.php | 2 +- include/classes/statscache.class.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/admin_checks.php b/include/admin_checks.php index 0f5f7402..27e7011a 100644 --- a/include/admin_checks.php +++ b/include/admin_checks.php @@ -34,7 +34,7 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][ } if (class_exists('Memcached')) { $memcache_test = @new Memcached(); - if ($config['memcache']['sasl']) { + if ($config['memcache']['sasl'] === true) { $memcache_test->setOption(Memcached::OPT_BINARY_PROTOCOL, true); $memcache_test->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']); } diff --git a/include/classes/statscache.class.php b/include/classes/statscache.class.php index c224dbe6..615ba5d1 100644 --- a/include/classes/statscache.class.php +++ b/include/classes/statscache.class.php @@ -19,9 +19,9 @@ class StatsCache { require_once(CLASS_DIR . '/memcached.class.php'); } $this->cache = new Memcached(); - if ($config['memcache']['sasl']) { + if ($config['memcache']['sasl'] === true) { $this->cache->setOption(Memcached::OPT_BINARY_PROTOCOL, true); - $this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']) or die("failed!"); + $this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']); } } }