moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'w47_MDL-36682_m24_mcache' of git://github.com/skodak/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-11-19 14:50:48 +08:00
commit 98d11a8c83
9 changed files with 15 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

23
admin/settings/server.php
View file

@ -193,29 +193,6 @@ $temp->add(new admin_setting_configtext('curlcache', new lang_string('curlcache'
$temp->add(new admin_setting_configtext('curltimeoutkbitrate', new lang_string('curltimeoutkbitrate', 'admin'),
new lang_string('curltimeoutkbitrate_help', 'admin'), 56, PARAM_INT));
/* //TODO: we need to fix code instead of relying on slow rcache, enable this once we have some code that is actually using it
$temp->add(new admin_setting_special_selectsetup('cachetype', new lang_string('cachetype', 'admin'),
new lang_string('configcachetype', 'admin'), '',
array( '' => new lang_string('none'),
'internal' => 'internal',
'memcached' => 'memcached',
'eaccelerator' => 'eaccelerator')));
// NOTE: $CFG->rcache is forced to bool in lib/setup.php
$temp->add(new admin_setting_special_selectsetup('rcache', new lang_string('rcache', 'admin'),
new lang_string('configrcache', 'admin'), 0,
array( '0' => new lang_string('no'),
'1' => new lang_string('yes'))));
$temp->add(new admin_setting_configtext('rcachettl', new lang_string('rcachettl', 'admin'),
new lang_string('configrcachettl', 'admin'), 10));
$temp->add(new admin_setting_configtext('intcachemax', new lang_string('intcachemax', 'admin'),
new lang_string('configintcachemax', 'admin'), 10));
$temp->add(new admin_setting_configtext('memcachedhosts', new lang_string('memcachedhosts', 'admin'),
new lang_string('configmemcachedhosts', 'admin'), ''));
$temp->add(new admin_setting_configselect('memcachedpconn', new lang_string('memcachedpconn', 'admin'),
new lang_string('configmemcachedpconn', 'admin'), 0,
array( '0' => new lang_string('no'),
'1' => new lang_string('yes'))));
*/
$ADMIN->add('server', $temp);