diff options
| -rw-r--r-- | entities/index.php | 3 | ||||
| -rw-r--r-- | 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 -->
|