Merge pull request #1025 from jloguercio/8103

Advance settings doesn't work in forums inside a lp - Refs #8103

main/forum/editpost.php

@@ -118,7 +118,7 @@ JS;
 if ($origin == 'learnpath') {
     Display::display_reduced_header();
 } else {
-    Display :: display_header(null);
+    Display::display_header();
 }
 /* Is the user allowed here? */
 
@@ -216,6 +216,8 @@ if (!empty($values) and isset($_POST['SubmitPost'])) {
 }
 
 // Footer
-if (isset($origin) && $origin != 'learnpath') {
-    Display :: display_footer();
+if ($origin == 'learnpath') {
+    Display::display_reduced_footer();
+} else {
+    Display::display_footer();
 }

main/forum/newthread.php

@@ -162,7 +162,7 @@ JS;
 if ($origin == 'learnpath') {
     Display::display_reduced_header();
 } else {
-    Display :: display_header(null);
+    Display::display_header();
 }
 handle_forum_and_forumcategories();
 
@@ -188,6 +188,8 @@ if (!empty($values) && isset($values['SubmitPost'])) {
     store_thread($current_forum, $values);
 }
 
-if (isset($origin) && $origin != 'learnpath') {
-    Display :: display_footer();
+if ($origin == 'learnpath') {
+    Display::display_reduced_footer();
+} else {
+    Display::display_footer();
 }

main/forum/reply.php

@@ -164,10 +164,10 @@ $htmlHeadXtra[] = <<<JS
 JS;
 
 if ($origin == 'learnpath') {
-    Display :: display_reduced_header('');
+    Display::display_reduced_header();
 } else {
     // The last element of the breadcrumb navigation is already set in interbreadcrumb, so give an empty string.
-    Display :: display_header('');
+    Display::display_header();
 }
 /* Action links */
 
@@ -217,6 +217,8 @@ if (!empty($values) && isset($_POST['SubmitPost'])) {
     </script>';
 }
 
-if (isset($origin) && $origin != 'learnpath') {
-    Display :: display_footer();
+if ($origin == 'learnpath') {
+    Display::display_reduced_footer();
+} else {
+    Display::display_footer();
 }

main/inc/lib/display.lib.php

@@ -133,6 +133,14 @@ class Display
     {
         echo self::$global_template->show_footer_template();
     }
+    
+    /**
+     * Display the page footer
+     */
+    public static function display_reduced_footer()
+    {
+        echo self::$global_template->show_footer_js_template();
+    }
 
     public static function page()
     {

main/inc/lib/template.lib.php

@@ -1096,6 +1096,15 @@ class Template
         $tpl = $this->get_template('layout/show_footer.tpl');
         $this->display($tpl);
     }
+    
+    /**
+     * Show footer js template.
+     */
+    public function show_footer_js_template()
+    {
+        $tpl = $this->get_template('layout/footer.js.tpl');
+        $this->display($tpl);
+    }
 
     /**
      * Sets the plugin content in a template variable