From 0ba2ce0c3d1aad8622c618795fab5551f9dd349d Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 30 Jun 2008 10:24:46 +0000
Subject: Partial fix for constantly-shrinking widgets bug.

git-svn-id: https://code.elgg.org/elgg/trunk@1205 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 entities/index.php                | 3 ++-
 views/default/widgets/wrapper.php | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/entities/index.php b/entities/index.php
index b009d5d83..127d216b9 100644
--- a/entities/index.php
+++ b/entities/index.php
@@ -29,7 +29,8 @@
 
 	// Set the body to be the full view of the entity, and the title to be its title
 			$body = elgg_view_entity($entity,"",true);
-			$body = elgg_view_layout('one_column',$body);
+			if (!$shell)
+				$body = elgg_view_layout('one_column',$body);
 			
 	// Otherwise?
 		} else {
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index 6e3e26e5d..99deda834 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -57,17 +57,18 @@
 	?>
 	<div class="collapsable_box_content">
 		<?php 
+
+		echo "<div id=\"widgetcontent{$vars['entity']->getGUID()}\">";
+		
 		
 	} // end if callback != "true"
 
-		echo "<div id=\"widgetcontent{$vars['entity']->getGUID()}\">";
-	
 		echo elgg_view("widgets/{$handler}/view",$vars); 
 		
-		echo "</div>";
-		
 	if ($callback != "true") {
 		
+		echo "</div>";
+		
 		?>
 	</div><!-- /.collapsable_box_content -->
 	</div><!-- /.collapsable_box -->
-- 
cgit v1.2.3