--- content_moderation.module.orig	2010-08-13 09:16:20.000000000 -0400
+++ content_moderation.module	2010-08-13 09:16:14.000000000 -0400
@@ -222,7 +222,7 @@ function content_moderation_nodeapi(&$no
         // If this node has no live version yet, notice the user that the content is not valid.
         // Valid reasons are, that the node has been just created and not approved or, that all live
         // revisions have been revoked
-        drupal_set_message ( t('The content of this document has not been approved and is therefor not valid yet!'), 'warning' );
+        drupal_set_message ( t('The content of this document has not been approved and is therefore not valid yet!'), 'warning' );
       }
 
       // If we are showing a revision, show the author informations
@@ -720,7 +720,10 @@ function _content_moderation_show_latest
 
 // created from issue #792202
 function _content_moderation_determine_revision_url($revisions, $nid, $vid, $view = TRUE) {
-  if (count($revisions) == 1) {
+	// Adding logic to determine if there is already a live version as well
+	// If there is only 1 revision and no live version then we change the rev_url
+	$live = _content_moderation_live_revision($nid);
+  if (count($revisions) == 1 && $live->vid == '') {
     $rev_url = "node/{$nid}";
   }
   else {