From 4528e452aa8f9913fc462f7a290b26b0f9d7ac89 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Tue, 1 Sep 2015 15:10:56 +0200
Subject: [PATCH] GeneralConfigForm: Add ProxyConfigForm elements

refs #9916
---
 application/forms/Config/GeneralConfigForm.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/forms/Config/GeneralConfigForm.php b/application/forms/Config/GeneralConfigForm.php
index c3c771f97..e87ac5d49 100644
--- a/application/forms/Config/GeneralConfigForm.php
+++ b/application/forms/Config/GeneralConfigForm.php
@@ -3,6 +3,7 @@
 
 namespace Icinga\Forms\Config;
 
+use Icinga\Forms\Config\General\ProxyConfigForm;
 use Icinga\Web\Notification;
 use Icinga\Forms\ConfigForm;
 use Icinga\Forms\Config\General\LoggingConfigForm;
@@ -30,8 +31,10 @@ class GeneralConfigForm extends ConfigForm
     {
         $appConfigForm = new ApplicationConfigForm();
         $loggingConfigForm = new LoggingConfigForm();
+        $proxyConfigForm = new ProxyConfigForm();
         $this->addElements($appConfigForm->createElements($formData)->getElements());
         $this->addElements($loggingConfigForm->createElements($formData)->getElements());
+        $this->addElements($proxyConfigForm->createElements($formData)->getElements());
     }
 
     /**