Merge branch 'patch-3' into 'master'

Patch 3

Only load "ISPConfig.loadInitContent();" in "interface/web/themes/default/templates/main.tpl.htm" to fix #4309

See merge request !482

Author: Till Brehm

interface/web/themes/default/assets/javascripts/ispconfig.js

@@ -768,8 +768,6 @@ $(document).on('ready', function () {
 	$('.progress .progress-bar').css('width', function () {
 		return $(this).attr('aria-valuenow') + '%';
 	});
-	
-	ISPConfig.loadInitContent();
 
 	$('#searchform').submit(function(e) {
 		e.preventDefault();

interface/web/themes/default/templates/main.tpl.htm

@@ -141,7 +141,7 @@ <h4 class="modal-title">{tmpl_var name="datalog_changes_txt"}</h4>
 			searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">',
 			resultBoxPosition: ''
 		});
-
+        ISPConfig.loadInitContent();
 	});
   //-->
   </script>