diff --git a/workbench_moderation.module b/workbench_moderation.module index be8c7f3..89ff046 100644 --- a/workbench_moderation.module +++ b/workbench_moderation.module @@ -2530,16 +2530,17 @@ function workbench_moderation_node_edit_context($arg = NULL, $conf = NULL, $empt */ function workbench_moderation_drafty_predelete_revision($entity_type, $entity_id, $revision_id, $replaced_by) { if ($entity_type == 'node') { - $revision = node_load($entity_id, $revision_id); - // Preserve the revision timestamp and uid from the old revision. - db_update('node_revision') - ->fields(array( - 'timestamp' => $revision->revision_timestamp, - 'uid' => $revision->revision_uid, - )) - ->condition('vid', $replaced_by) - ->execute(); + $revision = node_load($entity_id, $revision_id); + if ($revision !== NULL) { + db_update('node_revision') + ->fields(array( + 'timestamp' => $revision->revision_timestamp, + 'uid' => $revision->revision_uid, + )) + ->condition('vid', $replaced_by) + ->execute(); + } // Remove the incorrect history from the new revision. db_delete('workbench_moderation_node_history')