From 117699c95751bd99731defae829b1fa062addc83 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 14 Nov 2018 11:48:48 +0100
Subject: [PATCH] ConfigController: fix config/diff URL handling

fixes #1704
---
 application/controllers/ConfigController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index a08fe61f..c2f72b39 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -346,7 +346,8 @@ class ConfigController extends ActionController
             }
         }
 
-        $this->content()->add(Html::tag('form', ['action' => $this->url(), 'method' => 'GET'], [
+        $baseUrl = $this->url()->without(['left', 'right']);
+        $this->content()->add(Html::tag('form', ['action' => (string) $baseUrl, 'method' => 'GET'], [
             new HtmlString($this->view->formSelect(
                 'left',
                 $leftSum,
@@ -355,7 +356,7 @@ class ConfigController extends ActionController
             )),
             Link::create(
                 Icon::create('flapping'),
-                $this->url(),
+                $baseUrl,
                 ['left' => $rightSum, 'right' => $leftSum]
             ),
             new HtmlString($this->view->formSelect(