- fix [ 1373707 ] File Pile not uploading images

- fix [ 1353425 ] getUsersInGroup includes expired Group of group members (Ed
   van Duinen)
 - fix [ 1373041 ] context menus in Admin Mode don't position correctly in IE
   ( Michele Dell'Aquila)

lib/WebGUI/Asset/FilePile.pm

@@ -179,6 +179,7 @@ sub editSave {
 		delete $newAsset->{_storageLocation};
 		$newAsset->setSize($storage->getFileSize($filename));
 		$newAsset->generateThumbnail if ($className eq "WebGUI::Asset::File::Image");
+		$newAsset->commit;
 	}
 	$tempStorage->delete;
 	return $class->getParent->www_manageAssets if ($session{form}{proceed} eq "manageAssets");

lib/WebGUI/Grouping.pm

@@ -320,10 +320,16 @@ sub getUsersInGroup {
 		$clause = "expireDate > ".time()." and ";
 	}
 	$clause .= "(groupId=".quote($groupId);
-	if ($recursive) {
+ 	if ($recursive) {
 		my $groups = getGroupsInGroup($groupId,1);
 		if ($#$groups >= 0) {
-			$clause .= " or groupId in (".quoteAndJoin($groups).")";
+			if ($withoutExpired) {
+				foreach my $groupId (@$groups) {
+					$clause .= " OR (groupId = ".quote($groupId)." AND expireDate > ".time().") ";
+				}
+			} else {
+				$clause .= " OR groupId IN (".quoteAndJoin(',',@$groups).")";
+			}
 		}
 	}
 	$clause .= ")";