Skip to content

Commit 7a6089b

Browse files
committed
More stringent check for enabling, removed superfluous die
1 parent 2a52042 commit 7a6089b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/admin_checks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535
if (class_exists('Memcached')) {
3636
$memcache_test = @new Memcached();
37-
if ($config['memcache']['sasl']) {
37+
if ($config['memcache']['sasl'] === true) {
3838
$memcache_test->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
3939
$memcache_test->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']);
4040
}

include/classes/statscache.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ public function __construct($config, $debug) {
1919
require_once(CLASS_DIR . '/memcached.class.php');
2020
}
2121
$this->cache = new Memcached();
22-
if ($config['memcache']['sasl']) {
22+
if ($config['memcache']['sasl'] === true) {
2323
$this->cache->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
24-
$this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']) or die("failed!");
24+
$this->cache->setSaslAuthData($config['memcache']['sasl']['username'], $config['memcache']['sasl']['password']);
2525
}
2626
}
2727
}

0 commit comments

Comments
 (0)