diff options
| author | zottel <github@zottel.net> | 2012-03-23 08:39:00 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-23 08:39:00 +0100 |
| commit | 5fadf68fb4e4a6e0fde6fbf82ad7600c8ca12c04 (patch) | |
| tree | 31d591b4f19fa71aa972aa797b51880728dc3d76 /view/default.php | |
| parent | e7d80a79fff23e6f8900b40677d11d1022a45df6 (diff) | |
| parent | 7706a8f9d8d71b89c791f31f957496b95b8bb31f (diff) | |
| download | volse-hubzilla-5fadf68fb4e4a6e0fde6fbf82ad7600c8ca12c04.tar.gz volse-hubzilla-5fadf68fb4e4a6e0fde6fbf82ad7600c8ca12c04.tar.bz2 volse-hubzilla-5fadf68fb4e4a6e0fde6fbf82ad7600c8ca12c04.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/default.php')
| -rwxr-xr-x | view/default.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/view/default.php b/view/default.php index ab1cb0f09..61f5f6863 100755 --- a/view/default.php +++ b/view/default.php @@ -10,7 +10,8 @@ <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
<section><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div>
- </section>
+ </section> + <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body>
</html>
|