L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-46796-master' of git://github.com/merrill-oakland/moodle

Browse Source
This commit is contained in:
Marina Glancy
2014-08-19 11:24:41 +08:00
parent b3194ab1b2 e75becf3b3
commit 628b2a5cd3
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cache/stores/memcache/lib.php
Vendored
+14 -14
View File
@@ -435,24 +435,24 @@ class cachestore_memcache extends cache_store implements cache_is_configurable {
}
$clustered = false;
$setservers = array();
if (isset($data->clustered)) {
$clustered = true;
}
$lines = explode("\n", $data->setservers);
$setservers = array();
foreach ($lines as $line) {
// Trim surrounding colons and default whitespace.
$line = trim(trim($line), ":");
if ($line === '') {
continue;
$lines = explode("\n", $data->setservers);
foreach ($lines as $line) {
// Trim surrounding colons and default whitespace.
$line = trim(trim($line), ":");
if ($line === '') {
continue;
}
$setserver = explode(':', $line, 3);
// We don't use weights, so display a debug message.
if (count($setserver) > 2) {
debugging('Memcache Set Server '.$setserver[0].' has too many parameters.');
}
$setservers[] = $setserver;
}
$setserver = explode(':', $line, 3);
// We don't use weights, so display a debug message.
if (count($setserver) > 2) {
debugging('Memcache Set Server '.$setserver[0].' has too many parameters.');
}
$setservers[] = $setserver;
}
return array(
cache/stores/memcached/lib.php
Vendored
+14 -14
View File
@@ -491,24 +491,24 @@ class cachestore_memcached extends cache_store implements cache_is_configurable
}
$clustered = false;
$setservers = array();
if (isset($data->clustered)) {
$clustered = true;
}
$lines = explode("\n", $data->setservers);
$setservers = array();
foreach ($lines as $line) {
// Trim surrounding colons and default whitespace.
$line = trim(trim($line), ":");
if ($line === '') {
continue;
$lines = explode("\n", $data->setservers);
foreach ($lines as $line) {
// Trim surrounding colons and default whitespace.
$line = trim(trim($line), ":");
if ($line === '') {
continue;
}
$setserver = explode(':', $line, 3);
// We don't use weights, so display a debug message.
if (count($setserver) > 2) {
debugging('Memcached Set Server '.$setserver[0].' has too many parameters.');
}
$setservers[] = $setserver;
}
$setserver = explode(':', $line, 3);
// We don't use weights, so display a debug message.
if (count($setserver) > 2) {
debugging('Memcached Set Server '.$setserver[0].' has too many parameters.');
}
$setservers[] = $setserver;
}
return array(