Merge branch '6.x' of github.com:bwoodhead/islandora into 6.x

formClass.inc

@@ -224,21 +224,22 @@ class formClass {
       '#weight' => -18
     );
 
-    $form['fedora_repository_url'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Fedora RISearch URL'),
-      '#default_value' => variable_get('fedora_repository_url', 'http://localhost:8080/fedora/risearch'),
-      '#description' => t('The url of the Fedora server'), '#required' => TRUE,
-      '#weight' => -16
-    );
-
     $form['fedora_base_url'] = array(
       '#type' => 'textfield',
       '#title' => t('Fedora base URL'),
       '#default_value' => variable_get('fedora_base_url', 'http://localhost:8080/fedora'),
       '#description' => t('The URL to use for REST-type connections'),
       '#required' => TRUE,
-      '#weight' => -14,
+      '#weight' => -16,
+    );
+    
+
+    $form['fedora_repository_url'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Fedora RISearch URL'),
+      '#default_value' => variable_get('fedora_repository_url', 'http://localhost:8080/fedora/risearch'),
+      '#description' => t('The url of the Fedora server'), '#required' => TRUE,
+      '#weight' => -14
     );
     
     $form['fedora_soap_url'] = array(