MDL-10660 reverting previous changes - see tracker

moodle · Apr 1, 2008 · 134d8a5 · 134d8a5
1 parent e3105d4
commit 134d8a5
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/admin/settings/server.php b/admin/settings/server.php
@@ -221,28 +221,12 @@
 
 // "performance" settingpage
 $temp = new admin_settingpage('performance', get_string('performance', 'admin'));
-if (function_exists('memcache_connect')) {
-    $temp->add(new admin_setting_configselect('cachetype', get_string('cachetype', 'admin'), 
-                                              get_string('configcachetype', 'admin'), false, 
-                                              array( '' => 'none', 
-                                                     'internal' => 'internal', 
-                                                     'memcached' => 'memcached', 
-                                                     'eaccelerator' => 'eaccelerator')));
-    $temp->add(new admin_setting_configtext('memcachedhosts', get_string('memcachedhosts', 'admin'),
-                                            get_string('configmemcachedhosts', 'admin'), ''));
-    $temp->add(new admin_setting_configselect('memcachedpconn', get_string('memcachedpconn', 'admin'),
-                                              get_string('configmemcachedpconn', 'admin'), false, 
-                                              array( '0' => 'false', 
-                                                     '1' => 'true')));
-}else{
-    $temp->add(new admin_setting_configselect('cachetype', get_string('cachetype', 'admin'), 
-                                              get_string('configcachetype', 'admin'), false, 
-                                              array( '' => 'none', 
-                                                     'internal' => 'internal', 
-                                                     'eaccelerator' => 'eaccelerator')));
-
-}
-
+$temp->add(new admin_setting_special_selectsetup('cachetype', get_string('cachetype', 'admin'),
+                                          get_string('configcachetype', 'admin'), '',
+                                          array( '' => get_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', get_string('rcache', 'admin'),
                                           get_string('configrcache', 'admin'), 0,
@@ -252,6 +236,12 @@
                                         get_string('configrcachettl', 'admin'), 10));
 $temp->add(new admin_setting_configtext('intcachemax', get_string('intcachemax', 'admin'),
                                         get_string('configintcachemax', 'admin'), 10));
+$temp->add(new admin_setting_configtext('memcachedhosts', get_string('memcachedhosts', 'admin'),
+                                        get_string('configmemcachedhosts', 'admin'), ''));
+$temp->add(new admin_setting_configselect('memcachedpconn', get_string('memcachedpconn', 'admin'),
+                                          get_string('configmemcachedpconn', 'admin'), 0,
+                                          array( '0' => get_string('no'),
+                                                 '1' => get_string('yes'))));
 $ADMIN->add('server', $temp);
 
 if (file_exists("$CFG->dirroot/$CFG->admin/mysql/frame.php")) {