fixed a couple bugs and added size aware file cache

docs/changelog/6.x.x.txt

@@ -1,4 +1,5 @@
 6.7.0
+ - Added asset versioning.
  - fix [ 1229188 ] typo in Help: Collaboration, Post List Template Variables
  - fix [ 1221284 ] Operation\user.pm i18n {internationalize labels}
  - All form field labels have been internationalized.
@@ -14,6 +15,7 @@
    way to upload files will be through the File Pile. Anyone wishing to make
    the File and Image assets available as normal assets in the new content
    menu are still able to do so, and existing sites will be left as they are.
+ - Added a file cache size limit option to the config file.
 
 
 6.6.3

docs/gotcha.txt

@@ -7,6 +7,12 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+6.7.0
+--------------------------------------------------------------------
+ * The asset API has changed slightly due to versioning, so if you
+	have any custom assets, check out migration.txt to make
+	sure they will comply.
+
 
 6.6.3
 --------------------------------------------------------------------

docs/upgrades/upgrade_6.2.11-6.3.0.pl

@@ -432,6 +432,8 @@ $sth->finish;
 
 
 print "\tConverting collateral manager items into assets\n" unless ($quiet);
+WebGUI::SQL->write("update collateral set collateralFolderId='0' where collateralFolderId=''");
+WebGUI::SQL->write("update collateral set collateralFolderId='0' where collateralFolderId is null");
 my $collateralRootLineage = getNextLineage('PBasset000000000000002');
 my $collateralRootId = WebGUI::SQL->setRow("asset","assetId",{
 	assetId=>"new",
@@ -500,7 +502,7 @@ my $lastCollateralFolderId = 'nolastid';
 my ($parentId, $baseLineage);
 my $sth = WebGUI::SQL->read("select * from collateral order by collateralFolderId");
 while (my $data = $sth->hashRef) {
-	next if ($data->{filename} eq "");
+	next if ($data->{filename} eq "" && $data->{collateralType} ne "snippet");
 	print "\t\tConverting collateral item ".$data->{collateralId}." for folder ".$data->{collateralFolderId}."\n" unless ($quiet);
 	unless ($lastCollateralFolderId eq $data->{collateralFolderId}) {
 		my $id = $data->{collateralFolderId};

docs/upgrades/upgrade_6.6.3-6.7.0.pl

@@ -21,12 +21,29 @@ GetOptions(
 WebGUI::Session::open("../..",$configFile);
 
 addAssetVersioning();
+updateConfigFile();
 insertHelpTemplate();
 insertXSLTSheets();
 insertSyndicatedContentTemplate();
 
 WebGUI::Session::close();
 
+sub updateConfigFile {
+	print "\tUpdating config file.\n" unless ($quiet);
+	my $pathToConfig = '../../etc/'.$configFile;
+	my $conf = Parse::PlainConfig->new('DELIM' => '=', 'FILE' => $pathToConfig, 'PURGE'=>1);
+	my %newConfig;
+	foreach my $key ($conf->directives) { # delete unwanted stuff
+        	unless ($key eq "wobject") {
+                	$newConfig{$key} = $conf->get($key);
+        	}
+	}
+	$newConfig{fileCacheSizeLimit} = 100000000;
+	$conf->purge;
+	$conf->set(%newConfig);
+	$conf->write;
+}
+
 sub addAssetVersioning {
     	print "\tMaking changes for asset versioning\n" unless ($quiet);
 	WebGUI::SQL->write("create table assetVersionTag (