Merge pull request #19 from bwoodhead/6.x

ISLANDORA-323: Fixed naming

SearchClass.inc

@@ -24,9 +24,12 @@ class SearchClass {
    */
   function solr_search($query, $startPage=1, $fq = NULL, $dismax = NULL) {
     $solrFile = trim(variable_get('islandora_solr_search_block_handler_file', 'plugins/SolrResults.inc'));
-    if (strpos($solrField, '../')) {  // Don't let us bust out of fedora_repository modules directory when looking for a handler
+
+    // Don't let us bust out of fedora_repository modules directory when looking for a handler
+    if (strpos($solrField, '../')) {  
       drupal_set_message(t('You have illegal characters in your solr handler function in the Islandora solr block config.'), 'error');
     }
+    
     $solrClass = trim(variable_get('islandora_solr_search_block_handler_class', 'SolrResults'));
     $solrFunction = trim(variable_get('islandora_solr_search_block_handler_function', 'SearchAndDisplay'));
     require_once(drupal_get_path('module', 'fedora_repository') . '/' . $solrFile);

tests/README_TESTING.txt

@@ -2,7 +2,7 @@ There are a few things to set up to get the Simpletests to run properly.
 
 Fedora Installation
 
-The test sets up the fedora_repository module with the default server settings.
+The test sets up the islandora module with the default server settings.
 This means it will expect a Fedora server to be running on localhost:8080
 with the usual defaults. The tests also expect the Islandora demo objects, i.e.,
 islandora:top, islandora:demos collections, etc. to be installed. (Go to