accidental reversion of features

islandora.module

@@ -1793,7 +1793,7 @@ function islandora_form_simpletest_test_form_alter(array &$form) {
   module_load_include('inc', 'simpletest', 'simpletest.pages');
   module_load_include('inc', 'islandora', 'tests/includes/test_utility_abstraction');
   $configuration = IslandoraTestUtilityClass::getTestConfiguration();
-  $filter_path = variable_get('islandora_simpletest_drupal_filter_path', $configuration['drupal_filter_file']);
+  $filter_path = $configuration['drupal_filter_file'];
   $filter_status = is_writable($filter_path);
   if ($filter_status) {
     $filter_status_message = theme_image(array('path' => 'misc/watchdog-ok.png', 'attributes' => array())) . " ";
@@ -1803,7 +1803,7 @@ function islandora_form_simpletest_test_form_alter(array &$form) {
   }
   else {
     $filter_status_message = theme_image(array('path' => 'misc/watchdog-error.png', 'attributes' => array())) . " ";
-    $filter_status_message .= t("Drupal filter at <b>!filter_path</b> is not writable by the server. Please make sure your webserver has permission to write to the Drupal filter. If the path given is incorrect, try setting the correct path in the test settings to see if this error is no longer present.", array(
+    $filter_status_message .= t("Drupal filter at <b>!filter_path</b> is not writable by the server. Please make sure your webserver has permission to write to the Drupal filter. If the path given is incorrect, you will need to change it in your server's test config file, located in the Islandora module's 'tests' folder as test_config.ini or default.test_config.ini.", array(
       '!filter_path' => $filter_path,
     ));
   }
@@ -1860,27 +1860,7 @@ function islandora_form_simpletest_test_form_alter(array &$form) {
 }
 
 /**
- * Implements hook_form_alter().
- */
-function islandora_form_simpletest_settings_form_alter(&$form, &$form_state) {
-  module_load_include('inc', 'islandora', 'tests/includes/test_utility_abstraction');
-  $configuration = IslandoraTestUtilityClass::getTestConfiguration();
-  $form['islandora_drupal_filter'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Islandora Drupal Filter Location'),
-    '#collapsible' => FALSE,
-    '#collapsed' => FALSE,
-  );
-  $form['islandora_drupal_filter']['islandora_simpletest_drupal_filter_path'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Path to the Drupal Filter'),
-    '#description' => t('The absolute path on the server to the Drupal filter XML file in the Fedora configuration. NOTE: This is simply used to populate the at-a-glance "is the Filter writeable" notice on the top of the list of tests, and DOES NOT actually have any bearing on its function within Islandora.'),
-    '#default_value' => variable_get('islandora_simpletest_drupal_filter_path', $configuration['drupal_filter_file']),
-  );
-}
-
-/**
- * Submit handler for islandora_form_simpletest_test_form_alter().
+ * Removes simpletest entries from the Drupal filter.
  */
 function islandora_repair_drupal_filter() {