From b5caa413865d2b554fb6ccf5ba82ccc76bad70d9 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 8 Jan 2020 12:33:05 +0200
Subject: [PATCH] Fixed `ignore_empty: true` not removing empty values in
 blueprint filtering

---
 CHANGELOG.md                               |  1 +
 composer.lock                              | 18 +++++++++---------
 system/src/Grav/Common/Data/Validation.php |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfbacef80..08dbd56e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
     * Grav 1.7: Fixed blueprint loading issues [#2782](https://github.com/getgrav/grav/issues/2782)
     * Fixed PHP 7.4 compatibility issue with `Stream`
     * Fixed new `Flex Users` being stored with wrong filename, login issues [#2785](https://github.com/getgrav/grav/issues/2785)
+    * Fixed `ignore_empty: true` not removing empty values in blueprint filtering
 
 # v1.7.0-rc.3
 ## 01/02/2020
diff --git a/composer.lock b/composer.lock
index e1efddf69..89453be12 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1844,12 +1844,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/rockettheme/toolbox.git",
-                "reference": "515885cf35dd7be30864216f87e7122c7f03be7d"
+                "reference": "b6701dec03a5c997af379edc999d1a9d0655d43f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/515885cf35dd7be30864216f87e7122c7f03be7d",
-                "reference": "515885cf35dd7be30864216f87e7122c7f03be7d",
+                "url": "https://api.github.com/repos/rockettheme/toolbox/zipball/b6701dec03a5c997af379edc999d1a9d0655d43f",
+                "reference": "b6701dec03a5c997af379edc999d1a9d0655d43f",
                 "shasum": ""
             },
             "archive": {
@@ -1907,7 +1907,7 @@
                 "source": "https://github.com/rockettheme/toolbox/tree/develop",
                 "issues": "https://github.com/rockettheme/toolbox/issues"
             },
-            "time": "2020-01-06T15:08:03+00:00"
+            "time": "2020-01-08T10:16:02+00:00"
         },
         {
             "name": "seld/cli-prompt",
@@ -4801,16 +4801,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.19",
+            "version": "7.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "4263f76a3fc65385e242ef7357b99f3bed36707e"
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4263f76a3fc65385e242ef7357b99f3bed36707e",
-                "reference": "4263f76a3fc65385e242ef7357b99f3bed36707e",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c",
+                "reference": "9467db479d1b0487c99733bb1e7944d32deded2c",
                 "shasum": ""
             },
             "require": {
@@ -4881,7 +4881,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-01-06T16:53:05+00:00"
+            "time": "2020-01-08T08:45:45+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
diff --git a/system/src/Grav/Common/Data/Validation.php b/system/src/Grav/Common/Data/Validation.php
index 9719209d7..236f9a211 100644
--- a/system/src/Grav/Common/Data/Validation.php
+++ b/system/src/Grav/Common/Data/Validation.php
@@ -703,9 +703,9 @@ class Validation
                             unset($val[$inner_key]);
                         }
                     }
-                }
 
-                $values[$key] = $val;
+                    $values[$key] = $val;
+                }
             }
         }