Permalink
Browse files

MDL-25290 cache: Fixed up memcache server settings and a couple of mi…

…nor things
  • Loading branch information...
1 parent 170f821 commit 42f5d1648d2f34445c52de4410f3888c41c70adb Sam Hemelryk committed Sep 18, 2012
Showing with 8 additions and 1 deletion.
  1. +1 −1 cache/renderer.php
  2. +3 −0 cache/stores/memcache/lib.php
  3. +3 −0 cache/stores/memcached/lib.php
  4. +1 −0 theme/base/style/admin.css
View
@@ -214,7 +214,7 @@ public function definition_summaries(array $definitions, array $actions) {
'mappings',
'actions'
);
- $table->data = array('none', 'cache');
+ $table->data = array();
$none = new lang_string('none', 'cache');
foreach ($definitions as $id => $definition) {
@@ -90,6 +90,9 @@ public function __construct($name, array $configuration = array()) {
// Nothing configured.
return;
}
+ if (!is_array($configuration['servers'])) {
+ $configuration['servers'] = array($configuration['servers']);
+ }
foreach ($configuration['servers'] as $server) {
if (!is_array($server)) {
$server = explode(':', $server, 3);
@@ -96,6 +96,9 @@ public function __construct($name, array $configuration = array()) {
// Nothing configured.
return;
}
+ if (!is_array($configuration['servers'])) {
+ $configuration['servers'] = array($configuration['servers']);
+ }
$compression = array_key_exists('compression', $configuration) ? (bool)$configuration['compression'] : true;
if (array_key_exists('serialiser', $configuration)) {
@@ -259,6 +259,7 @@
#core-cache-plugin-summaries table,
#core-cache-store-summaries table {width:100%;}
+#core-cache-lock-summary table,
#core-cache-definition-summaries table,
#core-cache-mode-mappings table {margin:0 auto;}
#core-cache-store-summaries .default-store td {color:#333;font-style: italic;}

0 comments on commit 42f5d16

Please sign in to comment.