From a4dbc3d391caabd4ef2afdd2fce309d523d5f78d Mon Sep 17 00:00:00 2001
From: githubertus <githubertus@ongolito.net>
Date: Fri, 15 Dec 2017 23:44:19 +0100
Subject: [PATCH 1/2] Don't crash when login session has timed out

---
 plugins/default/blog/pages/view.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/default/blog/pages/view.php b/plugins/default/blog/pages/view.php
index b811a7e..ca828f3 100644
--- a/plugins/default/blog/pages/view.php
+++ b/plugins/default/blog/pages/view.php
@@ -27,11 +27,12 @@
                 </div>
                 </div>
                 <div class="controls">
-                	<?php if(ossn_loggedin_user()->guid == $params['blog']->owner_guid || ossn_loggedin_user()->canModerate()){ ?>
-                	<a href="<?php echo $params['blog']->profileURL('edit');?>" class="btn btn-success"><?php echo ossn_print('edit');?></a>
-                	<a href="<?php echo $params['blog']->deleteURL();?>" class="btn btn-danger"><?php echo ossn_print('delete');?></a>
-                    <?php } ?>
+	               	<?php if(ossn_isLoggedin()) {
+				if(ossn_loggedin_user()->guid == $params['blog']->owner_guid || ossn_loggedin_user()->canModerate()){ ?>
+					<a href="<?php echo $params['blog']->profileURL('edit');?>" class="btn btn-success"><?php echo ossn_print('edit');?></a>
+					<a href="<?php echo $params['blog']->deleteURL();?>" class="btn btn-danger"><?php echo ossn_print('delete');?></a>
+        		<?php }} ?>
                 </div>
             </div>
 	</div>
-</div>
\ No newline at end of file
+</div>

From 8fa5dc0675f9a5456d99eb2b2c9f46123aea70d8 Mon Sep 17 00:00:00 2001
From: githubertus <githubertus@ongolito.net>
Date: Sat, 16 Dec 2017 00:01:44 +0100
Subject: [PATCH 2/2] handle TinyMCE html correctly

---
 plugins/default/blog/pages/view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/default/blog/pages/view.php b/plugins/default/blog/pages/view.php
index ca828f3..34fece8 100644
--- a/plugins/default/blog/pages/view.php
+++ b/plugins/default/blog/pages/view.php
@@ -12,7 +12,7 @@
 <div class="ossn-page-contents">
 	<div class="blog">
     		<div class="blog-title"><?php echo $params['blog']->title;?></div>
-			<div class="blog-body"><?php echo nl2br($params['blog']->description);?></div>
+			<div class="blog-body"><?php echo html_entity_decode($params['blog']->description, ENT_QUOTES, 'UTF-8');?></div>
             <div class="aba">
             		<?php
 						$user = ossn_user_by_guid($params['blog']->owner_guid);