Index: galleria.admin.inc
===================================================================
--- galleria.admin.inc	(revision 847)
+++ galleria.admin.inc	(working copy)
@@ -22,5 +22,10 @@
     '#description' => t('Value from 0 .. 1'),
   );
 
+  $form['galleria_content_type'] = array(
+  	'#type' => 'markup',
+  	'#value' => '<p>Edit workflow settings under a <a href="/admin/content/types">content type</a> to determine which types will use galleria.</p>',
+  );
+
   return system_settings_form($form);
 }
Index: galleria.module
===================================================================
--- galleria.module	(revision 846)
+++ galleria.module	(working copy)
@@ -181,14 +181,16 @@
   switch ($op) {
     case 'view':
       if (variable_get("galleria_$node->type", 0) == 1) {
-        if ($page) {
-          if (galleria_is_valid($node)) {
+      	// If there are imagefields, load them to $node->files so that they are recognized
+      	if (module_exists('content')) {
+      		galleria_load_imagefields($node);
+      	}
+        if ($page && galleria_is_valid($node)) {
             // this is a galleria node, so perform modifications!
             galleria_includes();
             unset($node->content['files']);
             $node->content['galleria']['#value'] = theme('galleria', $node);
             $node->content['galleria']['#weight'] = module_exists('content') ? content_extra_field_weight($node->type, "galleria") : -10;
-          }
         }
         else {
           drupal_set_message(t('Gallerias only display when viewing a node by itself on the page.'), 'warning');
@@ -197,6 +199,24 @@
   }
 }
 
+function galleria_load_imagefields($node) {
+	//Try to get the fields with field type 'image'
+	$result = db_query("SELECT field_name FROM {content_node_field} WHERE type = 'image'");
+	while ($row = db_fetch_array($result)){
+		$image_fields[] = $row['field_name'];
+	}
+	// Try to find if there are any of those fields exist and are populated in the node
+	if (!empty($image_fields)) {
+			foreach($image_fields as $image_field) {
+				if (isset($node->$image_field) && is_array($node->$image_field)) {
+					foreach($node->$image_field as $image_file){
+						$node->files[] = (object) $image_file;
+					}
+				}
+			}
+		}
+	}
+
 /**
  * Theme the link that opens a lightbox with a galleria in it
  */