Merge pull request #2 from Islandora/7.x

7.x update

includes/derivatives.inc

@@ -34,6 +34,7 @@
  *       watchdog if not defined.
  */
 function islandora_do_derivatives(AbstractObject $object, array $options) {
+  module_load_include('inc', 'islandora', 'includes/utilities');
   $options += array(
     'force' => FALSE,
   );

includes/solution_packs.inc

@@ -28,8 +28,17 @@ function islandora_solution_packs_get_required_objects($module = NULL) {
 
   if (!$required_objects) {
     $connection = islandora_get_tuque_connection();
+    if (isset($module)) {
+      // The module may be disabled when this function runs, as modules must be
+      // disabled before they can be uninstalled. We must manually load the
+      // module file to use it's islandora_required_objects hook.
+      module_load_include('module', $module, $module);
+      $required_objects = module_invoke($module, 'islandora_required_objects', $connection);
+    }
+    else {
       $required_objects = module_invoke_all('islandora_required_objects', $connection);
     }
+  }
 
   if ($module !== NULL) {
     if (isset($required_objects[$module])) {

includes/tuque.inc

@@ -85,6 +85,7 @@ class IslandoraTuque {
     }
 
     if (self::exists()) {
+      module_load_include('inc', 'islandora', 'includes/tuque_wrapper');
       $this->connection = new IslandoraRepositoryConnection($url, $user_string, $pass_string);
       $this->connection->reuseConnection = TRUE;
       $this->api = new IslandoraFedoraApi($this->connection);

islandora.module

@@ -1113,6 +1113,7 @@ function islandora_default_islandora_printer_object($object, $alter) {
  *   A IslandoraTuque instance
  */
 function islandora_get_tuque_connection($user = NULL, $url = NULL) {
+  module_load_include('inc', 'islandora', 'includes/tuque');
   $tuque = &drupal_static(__FUNCTION__);
   if (!$tuque) {
     if (IslandoraTuque::exists()) {