From 9a07cf9caf2cff9ee30d59bd0f3bf3aafac5d4f2 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 12 Jun 2009 15:24:16 +0000
Subject: [PATCH] Forward ported deployPackage autocommit fix.

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index c024159ed..2a1d087d0 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.7.11
  - Fixed a bug where empty version tags were not deleted. (Martin Kamerbeek / Oqapi)
+ - fixed: deploying a package doesn't commit version tag with autocommit on
 
 7.7.10
  - Made a change to LDAP auth that adds an OR to that query so that it also searches for a row with fieldData REGEXP '^uid=(value-from-ldap-directory-server),'. (Wes Morgan)
diff --git a/lib/WebGUI/AssetPackage.pm b/lib/WebGUI/AssetPackage.pm
index 3d2ac43b6..0fac4593b 100644
--- a/lib/WebGUI/AssetPackage.pm
+++ b/lib/WebGUI/AssetPackage.pm
@@ -306,6 +306,12 @@ sub www_deployPackage {
 			$deployedTreeMaster->update({isPackage=>0, styleTemplateId=>$self->get("styleTemplateId")});
 		}
 	}
+    if (WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session, {
+        allowComments   => 1,
+        returnUrl       => $self->getUrl,
+    }) eq 'redirect') {
+        return undef;
+    };
 	if ($self->session->form->param("proceed") eq "manageAssets") {
 		$self->session->http->setRedirect($self->getUrl('op=assetManager'));
 	} else {