merging forward 6.8.8 bugfix of [ 1423434 ] 6.8.5 - Versioning - users can see uncommitted data

docs/changelog/6.x.x.txt

@@ -65,6 +65,7 @@
  - fix [ 1429389 ] 6.9: "1" appended to HTML
 
 6.8.8
+ - fix [ 1423434 ] 6.8.5 - Versioning - users can see uncommitted data
  - fix [ 1437186 ] 6.8.7 deploy DataForm package does not copy fields
  - fix [ 1437563 ] Data picker intermittent for Admin
  - fix broken link to top of CS Assets configured as FAQs

lib/WebGUI/Asset.pm

@@ -196,7 +196,7 @@ sub definition {
 				status=>{
 					noFormPost=>1,
 					fieldType=>'hidden',
-					defaultValue=>'approved'
+					defaultValue=>'pending'
 					},
 				assetSize=>{
 					noFormPost=>1,

lib/WebGUI/AssetVersioning.pm

@@ -69,8 +69,9 @@ sub addRevision {
         my $newVersion = WebGUI::Asset->new($self->session,$self->getId, $self->get("className"), $now);
         $newVersion->updateHistory("created revision");
 	$newVersion->update($self->get);
-	$newVersion->setVersionLock;
-        $newVersion->update($properties) if (defined $properties);
+	$newVersion->{isLockedBy} = $self->session->user->userId;
+	$properties->{status} = 'pending';
+        $newVersion->update($properties);
         return $newVersion;
 }