aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/canvas/layouts/two_column_left_sidebar.php4
-rw-r--r--views/default/canvas/layouts/two_column_right_sidebar.php7
-rw-r--r--views/default/input/form.php4
3 files changed, 9 insertions, 6 deletions
diff --git a/views/default/canvas/layouts/two_column_left_sidebar.php b/views/default/canvas/layouts/two_column_left_sidebar.php
index 9894d51ad..b80e81bf1 100644
--- a/views/default/canvas/layouts/two_column_left_sidebar.php
+++ b/views/default/canvas/layouts/two_column_left_sidebar.php
@@ -21,14 +21,14 @@
?>
- <?php echo $vars['area3']; ?>
+ <?php if (isset($vars['area3'])) echo $vars['area3']; ?>
</div><!-- /two_column_left_sidebar -->
<!-- main content -->
<div id="two_column_left_sidebar_maincontent">
-<?php echo $vars['area2']; ?>
+<?php if (isset($vars['area2'])) echo $vars['area2']; ?>
</div><!-- /two_column_left_sidebar_maincontent -->
diff --git a/views/default/canvas/layouts/two_column_right_sidebar.php b/views/default/canvas/layouts/two_column_right_sidebar.php
index 2d9168cf9..157f95f2e 100644
--- a/views/default/canvas/layouts/two_column_right_sidebar.php
+++ b/views/default/canvas/layouts/two_column_right_sidebar.php
@@ -15,14 +15,17 @@
<!-- main content -->
<div id="two_column_right_sidebar_maincontent">
-<?php echo $vars['area2']; ?>
+<?php
+
+ echo elgg_view('page_elements/owner_block',array('content' => $vars['area1']));
+ if (isset($vars['area2'])) echo $vars['area2']; ?>
</div><!-- /two_column_right_sidebar_maincontent -->
<!-- right sidebar -->
<div id="two_column_right_sidebar">
-<?php echo $vars['area1']; ?>
+<?php if (isset($vars['area1'])) echo $vars['area1']; ?>
</div><!-- /two_column_right_sidebar -->
diff --git a/views/default/input/form.php b/views/default/input/form.php
index e3e403242..8be0cc5db 100644
--- a/views/default/input/form.php
+++ b/views/default/input/form.php
@@ -22,8 +22,8 @@
$name = $vars['internalname'];
$body = $vars['body'];
$action = $vars['action'];
- $enctype = $vars['enctype'];
- $method = $vars['method']; if (!$method) $method = 'POST';
+ if (isset($vars['enctype'])) { $enctype = $vars['enctype']; } else { $enctype = ''; }
+ if (isset($vars['method'])) { $method = $vars['method']; } else { $method = 'POST'; }
// Generate a security header
$security_header = "";