From 541cb1cec33f5259e311eca57bed89677c4db73a Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Wed, 19 Sep 2018 19:01:56 +0200
Subject: [PATCH] fix cover image when edit a page, autosize for tinymce

---
 bl-kernel/admin/views/edit-content.php | 4 ++--
 bl-plugins/tinymce/plugin.php          | 2 ++
 install.php                            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bl-kernel/admin/views/edit-content.php b/bl-kernel/admin/views/edit-content.php
index 912c7080..f2290a9b 100644
--- a/bl-kernel/admin/views/edit-content.php
+++ b/bl-kernel/admin/views/edit-content.php
@@ -51,7 +51,7 @@
 		// Cover image
 		echo Bootstrap::formInputHidden(array(
 			'name'=>'coverImage',
-			'value'=>$page->coverImage()
+			'value'=>$page->coverImage(false)
 		));
 
 		// Content
@@ -115,7 +115,7 @@
 			}
 		?>
 
-		<img id="jscoverImagePreview" style="width: 350px; height: 200px;" class="img-thumbnail" alt="coverImagePreview" src="<?php echo HTML_PATH_ADMIN_THEME_IMG ?>default.svg" />
+		<img id="jscoverImagePreview" style="width: 350px; height: 200px;" class="img-thumbnail" alt="coverImagePreview" src="<?php echo (empty($coverImage) ? HTML_PATH_ADMIN_THEME_IMG.'default.svg' : $page->coverImage() ) ?>" />
 
 		<?php
 			echo Bootstrap::formTitle(array('title'=>$L->g('External Cover image')));
diff --git a/bl-plugins/tinymce/plugin.php b/bl-plugins/tinymce/plugin.php
index fbd5bc26..6e6486c6 100644
--- a/bl-plugins/tinymce/plugin.php
+++ b/bl-plugins/tinymce/plugin.php
@@ -103,6 +103,8 @@ tinymce.init({
 	theme: "modern",
 	skin: "bludit",
 	min_height: $min_height,
+	autoresize_min_height: $min_height,
+	autoresize_bottom_margin: 10,
 	max_height: 1000,
 	element_format : "html",
 	entity_encoding : "raw",
diff --git a/install.php b/install.php
index cd22f83c..379e4280 100644
--- a/install.php
+++ b/install.php
@@ -510,7 +510,7 @@ function install($adminPassword, $timezone)
 				'toolbar1'=>'formatselect bold italic bullist numlist blockquote alignleft aligncenter alignright link pagebreak image removeformat code',
 				'toolbar2'=>'',
 				'mobileToolbar'=>'bold italic bullist formatselect',
-				'plugins'=>'code autolink image link pagebreak advlist lists textcolor colorpicker textpattern'
+				'plugins'=>'code autolink image link pagebreak advlist lists textcolor colorpicker textpattern autoresize'
 			),
 		JSON_PRETTY_PRINT),
 		LOCK_EX