From 66e9fba583ba62c93bf8035f52a1fab91c8d469b Mon Sep 17 00:00:00 2001
From: brycebba <brycebba@gmail.com>
Date: Sat, 1 Dec 2018 18:12:04 -0800
Subject: [PATCH] adding tinymce support using new textareasupport2 component

---
 ossn_com.xml                        |  4 ++--
 plugins/default/blog/pages/view.php |  2 +-
 plugins/default/forms/blog/add.php  |  9 ++++++---
 plugins/default/forms/blog/edit.php | 10 ++++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ossn_com.xml b/ossn_com.xml
index 69d75be..85ca677 100644
--- a/ossn_com.xml
+++ b/ossn_com.xml
@@ -7,9 +7,9 @@
     <license>GNU General Public License, version 2</license>
     <author_url>https://www.softlab24.com/</author_url>
     <license_url>http://opensource-socialnetwork.org/licence/</license_url>
-    <version>1.1</version>
+    <version>2.0</version>
 	<requires>
 		<type>ossn_version</type>
-		<version>4.5</version>
+		<version>4.0</version>
 	</requires>
 </component>
diff --git a/plugins/default/blog/pages/view.php b/plugins/default/blog/pages/view.php
index b811a7e..011ab6c 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);?></div>
             <div class="aba">
             		<?php
 						$user = ossn_user_by_guid($params['blog']->owner_guid);
diff --git a/plugins/default/forms/blog/add.php b/plugins/default/forms/blog/add.php
index ea0f07f..9523b62 100644
--- a/plugins/default/forms/blog/add.php
+++ b/plugins/default/forms/blog/add.php
@@ -15,8 +15,11 @@
  </div>
  <div>
  	<label><?php echo ossn_print('blog:contents');?></label>
-    <textarea class="ossn-editor" name="contents"></textarea>
- </div>
+	<?php	echo ossn_plugin_view('input/textarea', array(
+				'class' => 'ossn-editor',
+				'name'  => 'contents'
+	)); ?>
+</div>
  <div class="margin-top-10">
  	<input type="submit" class="btn btn-success" value="<?php echo ossn_print('save');?>" />
- </div>
+ </div>
\ No newline at end of file
diff --git a/plugins/default/forms/blog/edit.php b/plugins/default/forms/blog/edit.php
index 71b1b43..444ef54 100644
--- a/plugins/default/forms/blog/edit.php
+++ b/plugins/default/forms/blog/edit.php
@@ -15,9 +15,15 @@
  </div>
  <div>
  	<label><?php echo ossn_print('blog:contents');?></label>
-    <textarea class="ossn-editor" name="contents"><?php echo $params['blog']->description;?></textarea>
+	 <?php	echo ossn_plugin_view('input/textarea', array(
+				'class' => 'ossn-editor',
+				'name'  => 'contents',
+				'value' => html_entity_decode($params['blog']->description)
+	)); ?>
+
+ 	<textarea name="contents" class="ossn-editor"><?php echo html_entity_decode($params['blog']->description); ?></textarea>
  </div>
  <div class="margin-top-10">
  	<input type="hidden" name="guid" value="<?php echo $params['blog']->guid;?>" />
  	<input type="submit" class="btn btn-success" value="<?php echo ossn_print('save');?>" />
- </div>
+ </div>
\ No newline at end of file