From 6028e4692d172b63f8af79c4460f9dbff5a9a01c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:05 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 interface/web/themes/default/assets/javascripts/ispconfig.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index 7d7dd3f..21c8c1b 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -364,9 +364,11 @@
 	},
 
 	loadInitContent: function() {
+		var startpage = $('#pageContent').attr('data-startpage');
+		if(!startpage) startpage = 'dashboard/dashboard.php';
 		var pageContentObject = $.ajax({
 			type: "GET",
-			url: "dashboard/dashboard.php",
+			url: startpage,
 			data: "",
 			dataType: "html",
 			beforeSend: function() {

--
Gitblit v1.9.1