From 7f453be1ccb36a043dcd605f3f14298ff3929552 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Oct 2014 16:00:52 +0200
Subject: [PATCH] Fix that no form values are stored for the LdapDiscoveryPage

refs #7163
---
 application/forms/Setup/LdapDiscoveryPage.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/forms/Setup/LdapDiscoveryPage.php b/application/forms/Setup/LdapDiscoveryPage.php
index db052d03f..1ee5ee03a 100644
--- a/application/forms/Setup/LdapDiscoveryPage.php
+++ b/application/forms/Setup/LdapDiscoveryPage.php
@@ -69,15 +69,14 @@ class LdapDiscoveryPage extends Form
      */
     public function isValid($data)
     {
-        if ($data['skip_validation'] === '1') {
-            return true;
-        }
         if (false === parent::isValid($data)) {
             return false;
         }
-        if (false === $this->discoveryForm->isValid($data)) {
+
+        if (! $data['skip_validation'] && false === $this->discoveryForm->isValid($data)) {
             return false;
         }
+
         return true;
     }