From 9f5e2ef37457cb802e8f478ff6e5c4d5ca669325 Mon Sep 17 00:00:00 2001
From: Rafik Robeal <rafik@mantishub.net>
Date: Tue, 24 Nov 2015 10:50:02 -0800
Subject: [PATCH] Fix merge issues:

- Use the same CDN model as in matisbt/master
---
 core/error_api.php          | 1 -
 core/layout_api.php         | 7 ++-----
 print_all_bug_page.php      | 1 -
 print_all_bug_page_word.php | 1 -
 print_bug_page.php          | 1 -
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/error_api.php b/core/error_api.php
index 59333c0ea6..b32321f85a 100644
--- a/core/error_api.php
+++ b/core/error_api.php
@@ -282,7 +282,6 @@ function error_handler( $p_type, $p_error, $p_file, $p_line, array $p_context )
 							layout_footer();
 						}
 					} else {
-						html_base_javascripts();
 						layout_body_javascript();
 						html_body_end();
 						html_end();
diff --git a/core/layout_api.php b/core/layout_api.php
index bfbf81201a..32af77d599 100644
--- a/core/layout_api.php
+++ b/core/layout_api.php
@@ -88,6 +88,8 @@ function layout_page_header_begin( $p_page_title = null ) {
 	# Advertise the availability of the browser search plug-ins.
 	echo "\t", '<link rel="search" type="application/opensearchdescription+xml" title="MantisBT: Text Search" href="' . string_sanitize_url( 'browser_search_plugin.php?type=text', true ) . '" />' . "\n";
 	echo "\t", '<link rel="search" type="application/opensearchdescription+xml" title="MantisBT: Issue Id" href="' . string_sanitize_url( 'browser_search_plugin.php?type=id', true ) . '" />' . "\n";
+
+	html_head_javascript();
 }
 
 /**
@@ -164,8 +166,6 @@ function layout_page_end( $p_file = null ) {
 	layout_scroll_up_button();
 
 	layout_main_container_end();
-
-	html_base_javascripts();
 	layout_body_javascript();
 
 	html_body_end();
@@ -191,8 +191,6 @@ function layout_admin_page_end() {
 	layout_scroll_up_button();
 
 	layout_main_container_end();
-
-	html_base_javascripts();
 	layout_body_javascript();
 
 	html_body_end();
@@ -342,7 +340,6 @@ function layout_login_page_end() {
 	echo '</div>';
 	layout_main_content_end();
 	layout_main_container_end();
-	html_base_javascripts();
 	layout_body_javascript();
 
 	echo '</body>', "\n";
diff --git a/print_all_bug_page.php b/print_all_bug_page.php
index b818551ef0..d4f0bb6ad7 100644
--- a/print_all_bug_page.php
+++ b/print_all_bug_page.php
@@ -246,7 +246,6 @@
 </table>
 </form>
 <?php
-html_base_javascripts();
 layout_body_javascript();
 html_body_end();
 html_end();
diff --git a/print_all_bug_page_word.php b/print_all_bug_page_word.php
index 7f96f38aa5..e2e26c25db 100644
--- a/print_all_bug_page_word.php
+++ b/print_all_bug_page_word.php
@@ -561,7 +561,6 @@
 	} # end in_array
 }  # end main loop
 
-html_base_javascripts();
 layout_body_javascript();
 html_body_end();
 html_end();
diff --git a/print_bug_page.php b/print_bug_page.php
index 9119462947..0b5a81a4c9 100644
--- a/print_bug_page.php
+++ b/print_bug_page.php
@@ -583,7 +583,6 @@
 ?>
 
 <?php
-html_base_javascripts();
 layout_body_javascript();
 html_body_end();
 html_end();