Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x

aragonc · aragonc · commit eea076320c90 · 2018-04-16T17:24:13.000-05:00
diff --git a/main/blog/blog.php b/main/blog/blog.php
@@ -431,13 +431,13 @@
         break;
 }
 
-$content = Display::return_introduction_section(TOOL_BLOGS);
-$content .= $tpl->fetch($blogLayout);
+$content = $tpl->fetch($blogLayout);
 
 if ($actionsLeft) {
     $tpl->assign(
         'actions',
-        Display::toolbarAction('toolbar', [$actionsLeft])
+        Display::return_introduction_section(TOOL_BLOGS)
+            .Display::toolbarAction('toolbar', [$actionsLeft])
     );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -431,13 +431,13 @@`
`431`	`431`	`break;`
`432`	`432`	`}`
`433`	`433`
`434`		`-$content = Display::return_introduction_section(TOOL_BLOGS);`
`435`		`-$content .= $tpl->fetch($blogLayout);`
	`434`	`+$content = $tpl->fetch($blogLayout);`
`436`	`435`
`437`	`436`	`if ($actionsLeft) {`
`438`	`437`	`$tpl->assign(`
`439`	`438`	`'actions',`
`440`		`- Display::toolbarAction('toolbar', [$actionsLeft])`
	`439`	`+ Display::return_introduction_section(TOOL_BLOGS)`
	`440`	`+ .Display::toolbarAction('toolbar', [$actionsLeft])`
`441`	`441`	`);`
`442`	`442`	`}`
`443`	`443`