Merge branch '4.0-dev' into 4.0_module-xtd_js

joomla · Jan 13, 2020 · 2435beb · 2435beb
2 parents a202ae3 + 5609d00
commit 2435beb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/administrator/templates/system/css/error.css b/administrator/templates/system/css/error.css
@@ -4,7 +4,7 @@
  */
 
 .outline {
-	margin: 0 auto; 
+	margin: 0 auto;
 	width: 550px;
 	border: 1px solid #cccccc;
 	background: #ffffff;
@@ -40,9 +40,7 @@ h1 {
 }
 
 td {
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
+	padding: 3px 5px;
 	border: solid 1px #bbbbbb;
 	font-size: 10px;
 }

diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -594,6 +594,7 @@ public function onDisplay(
 				'image_title'        => true,
 				'height'             => $html_height,
 				'width'              => $html_width,
+				'elementpath'        => (bool) $levelParams->get('element_path', true),
 				'resize'             => $resizing,
 				'templates'          => $templates,
 				'image_advtab'       => (bool) $levelParams->get('image_advtab', false),