diff -u b/plugins/content_types/fieldable_panels_pane.inc b/plugins/content_types/fieldable_panels_pane.inc --- b/plugins/content_types/fieldable_panels_pane.inc +++ b/plugins/content_types/fieldable_panels_pane.inc @@ -219,12 +219,7 @@ if (!empty($entity->is_new) || $revision_context_aware) { if (module_exists('uuid') && isset($entity->uuid)) { if ($revision_context_aware) { - // @todo: So I feel that this should be vuuid, however, when I tried - // the entity is never loaded back up, seems to work fine as - // just vid. I did briefly look, however, in the interest of - // time I stopped, hopefully someone else knows. - //$entity_id = 'vuuid:' . $entity->vuuid; - $entity_id = 'vid:' . $entity->vid; + $entity_id = 'vuuid:' . $entity->vuuid; } else { $entity_id = 'uuid:' . $entity->uuid; @@ -342,6 +337,12 @@ $content = reset($content); } } + elseif ($type == 'vuuid' && module_exists('uuid')) { + $vids = entity_get_id_by_uuid('fieldable_panels_pane', array($id), TRUE); + if ($vids && $content = entity_load('fieldable_panels_pane', FALSE, array('vid' => reset($vids)))) { + $content = reset($content); + } + } elseif ($type == 'vid') { $fpid = db_query('SELECT fpid FROM {fieldable_panels_panes_revision} WHERE vid = :vid', array(':vid' => $id))->fetchField(); $content = fieldable_panels_panes_load($fpid, $id); @@ -365 +365,0 @@ -