Merge branch '7.x' of github.com:Islandora/islandora into 7.x

islandora_basic_image/islandora_basic_image.module

@@ -195,8 +195,14 @@ function islandora_basic_image_islandora_view_object($object, $user, $page_numbe
 
 function islandora_basic_image_islandora_ingest_post_ingest($object) {
   $cmodel_list = islandora_basic_image_islandora_get_types();
+  if(!isset($cmodel_list)){
+    return ;
+  }
   $models = $object->models;
-  foreach ($object->models as $model) {
+  if(!isset($models)){
+    return ;
+  }
+  foreach ($models as $model) {
     if (isset($cmodel_list[$model])) {
       module_load_include('inc', 'islandora_basic_image', 'includes/image_process');
       islandora_basic_image_create_all_derivatives($object);