From d565c5021ba9fc121fa120be3656268a962859cc Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 21 Apr 2010 21:36:04 +0000
Subject: [PATCH] BUGFIX Fixed overflow settings in jQuery.fitheighttoparent

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@103292 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 .../jquery-fitheighttoparent/jquery.fitheighttoparent.js      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/javascript/jquery-fitheighttoparent/jquery.fitheighttoparent.js b/javascript/jquery-fitheighttoparent/jquery.fitheighttoparent.js
index 9c952d56..1be1efa0 100644
--- a/javascript/jquery-fitheighttoparent/jquery.fitheighttoparent.js
+++ b/javascript/jquery-fitheighttoparent/jquery.fitheighttoparent.js
@@ -23,6 +23,7 @@ jQuery.fn.extend({
 			if($this.is(':visible') && $this.parent().is(':visible')) {
 				
 				// we set overflow = hidden so that large children don't muck things up in IE6 box model
+				var origParentOverflow = $this.parent().css('overflow');
 				$this.parent().css('overflow', 'hidden');
 				
 				// get height from parent without any margins as a starting point,
@@ -47,6 +48,9 @@ jQuery.fn.extend({
 
 				// set new height
 				$this.height(height);
+				
+				// Reset overflow
+				$this.parent().css('overflow', origParentOverflow);
 			}
 		});
 	}