? .DS_Store
? 270302_11_upload_type_namespace_conflict_D7.patch
? 270302_13_upload_type_namespace_conflict_D7.patch
? 270302_8_upload_type_namespace_conflict_D7.patch
? block_body_required_00.patch
? clean_url_form_01.patch
? clean_url_form_02.patch
? form_required_cursor_01.patch
? make_node_optional_00.patch
? make_node_optional_01.patch
? make_node_optional_02.patch
? make_node_optional_03.patch
? password_colouring_00.patch
? upload_variable_conflict_00.patch
? sites/.DS_Store
? sites/default/settings.php
Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.159
diff -u -p -r1.159 install.php
--- install.php	1 Mar 2009 09:32:16 -0000	1.159
+++ install.php	15 Mar 2009 22:26:44 -0000
@@ -725,7 +725,7 @@ function install_tasks($profile, $task) 
       drupal_add_js('misc/timezone.js');
       // We add these strings as settings because JavaScript translation does not
       // work on install time.
-      drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail')), 'cleanURL' => array('success' => st('Your server has been successfully tested to support this feature.'), 'failure' => st('Your system configuration does not currently support this feature. The <a href="http://drupal.org/node/15365">handbook page on Clean URLs</a> has additional troubleshooting information.'), 'testing' => st('Testing clean URLs...'))), 'setting');
+      drupal_add_js(array('copyFieldValue' => array('edit-site-mail' => array('edit-account-mail'))), 'setting');
       drupal_add_js('
 // Global Killswitch
 if (Drupal.jsEnabled) {
@@ -1027,15 +1027,8 @@ function install_configure_form(&$form_s
   );
 
   $form['server_settings']['clean_url'] = array(
-    '#type' => 'radios',
-    '#title' => st('Clean URLs'),
+    '#type' => 'hidden',
     '#default_value' => 0,
-    '#options' => array(0 => st('Disabled'), 1 => st('Enabled')),
-    '#description' => st('This option makes Drupal emit "clean" URLs (i.e. without <code>?q=</code> in the URL).'),
-    '#disabled' => TRUE,
-    '#prefix' => '<div id="clean-url" class="install">',
-    '#suffix' => '</div>',
-    '#weight' => 10,
   );
 
   $form['server_settings']['update_status_module'] = array(
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.130
diff -u -p -r1.130 system.admin.inc
--- modules/system/system.admin.inc	9 Mar 2009 11:44:54 -0000	1.130
+++ modules/system/system.admin.inc	15 Mar 2009 22:26:45 -0000
@@ -1753,11 +1753,10 @@ function system_site_maintenance_setting
  */
 function system_clean_url_settings() {
   $form['clean_url'] = array(
-    '#type' => 'radios',
-    '#title' => t('Clean URLs'),
+    '#type' => 'checkbox',
+    '#title' => t('Enable clean URLs'),
     '#default_value' => 0,
-    '#options' => array(t('Disabled'), t('Enabled')),
-    '#description' => t('This option makes Drupal emit "clean" URLs (i.e. without <code>?q=</code> in the URL).'),
+    '#description' => t('Use paths like <code>example.com/node</code> instead of <code>example.com/?q=node</code>.'),
   );
 
   if (!variable_get('clean_url', 0)) {
Index: modules/system/system.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.js,v
retrieving revision 1.20
diff -u -p -r1.20 system.js
--- modules/system/system.js	13 Mar 2009 23:15:09 -0000	1.20
+++ modules/system/system.js	15 Mar 2009 22:26:45 -0000
@@ -25,7 +25,6 @@ Drupal.behaviors.cleanURLsSettingsCheck 
       success: function () {
         // Check was successful.
         $("#clean-url input.form-radio").attr("disabled", false);
-        $("#clean-url .description span").append('<div class="ok">'+ Drupal.t('Your server has been successfully tested to support this feature.') +"</div>");
         $("#testing").hide();
       },
       error: function() {
@@ -47,8 +46,6 @@ Drupal.behaviors.cleanURLsSettingsCheck 
  */
 Drupal.cleanURLsInstallCheck = function() {
   var url = location.protocol +"//"+ location.host + Drupal.settings.basePath +"admin/settings/clean-urls/check";
-  $("#clean-url .description").append('<span><div id="testing">'+ Drupal.settings.cleanURL.testing +"</div></span>");
-  $("#clean-url.install").css("display", "block");
   // Submit a synchronous request to avoid database errors associated with
   // concurrent requests during install.
   $.ajax({
@@ -57,18 +54,9 @@ Drupal.cleanURLsInstallCheck = function(
     dataType: 'json',
     success: function () {
       // Check was successful.
-      $("#clean-url input.form-radio").attr("disabled", false);
-      $("#clean-url input.form-radio").attr("checked", 1);
-      $("#clean-url .description span").append('<div class="ok">'+ Drupal.settings.cleanURL.success +"</div>");
-      $("#testing").hide();
+      $("#edit-clean-url").attr("value", 1);
     },
-    error: function() {
-      // Check failed.
-      $("#clean-url .description span").append('<div class="warning">'+ Drupal.settings.cleanURL.failure +"</div>");
-      $("#testing").hide();
-    }
   });
-  $("#clean-url").addClass('clean-url-processed');
 };
 
 /**