mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 22:08:20 +01:00
Merge branch 'MDL-40680-master' of git://github.com/danpoltawski/moodle
This commit is contained in:
commit
deeae9c155
4
cache/stores/memcached/addinstanceform.php
vendored
4
cache/stores/memcached/addinstanceform.php
vendored
@ -57,7 +57,7 @@ class cachestore_memcached_addinstance_form extends cachestore_addinstance_form
|
||||
$form->addElement('select', 'serialiser', get_string('useserialiser', 'cachestore_memcached'), $serialiseroptions);
|
||||
$form->addHelpButton('serialiser', 'useserialiser', 'cachestore_memcached');
|
||||
$form->setDefault('serialiser', Memcached::SERIALIZER_PHP);
|
||||
$form->setType('serialiser', PARAM_NUMBER);
|
||||
$form->setType('serialiser', PARAM_INT);
|
||||
|
||||
$form->addElement('text', 'prefix', get_string('prefix', 'cachestore_memcached'), array('size' => 16));
|
||||
$form->setType('prefix', PARAM_ALPHANUM);
|
||||
@ -74,4 +74,4 @@ class cachestore_memcached_addinstance_form extends cachestore_addinstance_form
|
||||
$form->setDefault('bufferwrites', 0);
|
||||
$form->setType('bufferwrites', PARAM_BOOL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
2
cache/stores/memcached/lib.php
vendored
2
cache/stores/memcached/lib.php
vendored
@ -339,7 +339,7 @@ class cachestore_memcached extends cache_store implements cache_is_configurable
|
||||
$options[Memcached::SERIALIZER_JSON] = get_string('serialiser_json', 'cachestore_memcached');
|
||||
}
|
||||
if (Memcached::HAVE_IGBINARY) {
|
||||
$options[Memcached::SERIALIZER_IGBINARY] = get_string('serialiser_php', 'cachestore_memcached');
|
||||
$options[Memcached::SERIALIZER_IGBINARY] = get_string('serialiser_igbinary', 'cachestore_memcached');
|
||||
}
|
||||
return $options;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user