Merge pull request #456 from ajstanley/7.x

Fixed drush command, fixed link display

includes/utilities.inc

@@ -528,7 +528,7 @@ function islandora_display_repository_inaccessible_message() {
   $link = l($text, 'admin/islandora/configure', array('attributes' => array('title' => $text)));
   $message = t('Could not connect to the repository. Please check the settings on the !link page.',
   array('!link' => $link));
-  drupal_set_message(check_plain($message), 'error', FALSE);
+  drupal_set_message(filter_xss($message), 'error', FALSE);
 
 }
 

islandora.drush.inc

@@ -176,11 +176,11 @@ function drush_islandora_solution_pack_install_content_models() {
     $info = islandora_solution_packs_get_required_objects($module);
     $objects_to_add = array();
     foreach ($info['objects'] as $key => $candidate) {
-      $object = islandora_object_load($candidate);
+      if (in_array('fedora-system:ContentModel-3.0', $candidate->models)) {
-      if (in_array('fedora-system:ContentModel-3.0', $object->models)) {
         $objects_to_add[] = $candidate;
       }
     }
+    if (count($objects_to_add) > 0) {
       foreach ($objects_to_add as $object_to_add) {
         $old_object = islandora_object_load($object_to_add->id);
         if ($old_object) {
@@ -193,7 +193,8 @@ function drush_islandora_solution_pack_install_content_models() {
         $new_object = islandora_add_object($object_to_add);
         $verb = $deleted ? dt("Replaced") : dt("Added");
         if ($new_object) {
-        drush_log("$verb " . $object_to_add->id . " - " . $object_to_add->label);
+          drush_print("$verb " . $object_to_add->id . " - " . $object_to_add->label);
+        }
       }
     }
   }