From 0a829e5da7d8a50e7abaa3dd87ae5fb10d0fd5af Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Fri, 7 Sep 2007 18:55:56 +0000
Subject: [PATCH] importing a package didn't follow auto commit settings

---
 docs/changelog/7.x.x.txt   | 1 +
 lib/WebGUI/AssetPackage.pm | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a8e7f62cd..8862af1c4 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -22,6 +22,7 @@
  - Inbox messages sent by Data Forms add sent by user
  - Hide encryption settings for edit branch when SSL disabled
  - fix: Edit Branch doesn't follow auto commit settings
+ - fix: Importing a package doesn't follow auto commit settings
 
 7.4.5
  - fix: Apostrophy incorrectly escaped as double quote in some places
diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm
index bde8702bb..f395ca893 100644
--- a/lib/WebGUI/AssetPackage.pm
+++ b/lib/WebGUI/AssetPackage.pm
@@ -198,7 +198,14 @@ sub importPackage {
 		my $newAsset = $asset->importAssetData($data);
 		$assets{$newAsset->getId} = $newAsset;
 	}
-	return undef;
+	if ($self->session->setting->get("autoRequestCommit")) {
+        if ($self->session->setting->get("skipCommitComments")) {
+            WebGUI::VersionTag->getWorking($self->session)->requestCommit;
+        } else {
+		    $self->session->http->setRedirect($self->getUrl("op=commitVersionTag;tagId=".WebGUI::VersionTag->getWorking($self->session)->getId));
+        }
+	}
+    return undef;
 }
 
 #-------------------------------------------------------------------