From 024e13295f3d4446805918452f2d907dda96e5ce Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 15 Apr 2015 09:44:33 -0400
Subject: [PATCH] - ported some patches

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

diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index bc5c988..0416e40 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -635,7 +635,11 @@
 		
 		var dir = $self.attr('data-ordered');
 		
-		act = act + '?orderby=' + column;
+		var separator = '?';
+		if(act.indexOf("?") >= 0){
+			separator = '&';
+		}
+		act = act + separator + 'orderby=' + column;
 		ISPConfig.submitForm(form, act);
 		
 		$(document).ajaxComplete(function() {

--
Gitblit v1.9.1