From 8673ac15bcafc66708e59c725ed86b650f19a705 Mon Sep 17 00:00:00 2001
From: Daniel Hensby <dan@hens.by>
Date: Thu, 8 Jan 2015 18:26:04 +0000
Subject: [PATCH] MINOR Empty YAML config causes invalid argument error

---
 core/manifest/ConfigManifest.php                            | 6 ++++--
 .../fixtures/configmanifest/mysite/_config/empty.yml        | 0
 .../fixtures/configmanifest/mysite/_config/namedempty.yml   | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 tests/core/manifest/fixtures/configmanifest/mysite/_config/empty.yml
 create mode 100644 tests/core/manifest/fixtures/configmanifest/mysite/_config/namedempty.yml

diff --git a/core/manifest/ConfigManifest.php b/core/manifest/ConfigManifest.php
index 22e6dd51e..985747069 100644
--- a/core/manifest/ConfigManifest.php
+++ b/core/manifest/ConfigManifest.php
@@ -652,8 +652,10 @@ class SS_ConfigManifest {
 	 * @return void
 	 */
 	public function mergeInYamlFragment(&$into, $fragment) {
-		foreach ($fragment as $k => $v) {
-			Config::merge_high_into_low($into[$k], $v);
+		if ($fragment) {
+			foreach ($fragment as $k => $v) {
+				Config::merge_high_into_low($into[$k], $v);
+			}
 		}
 	}
 
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/empty.yml b/tests/core/manifest/fixtures/configmanifest/mysite/_config/empty.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/core/manifest/fixtures/configmanifest/mysite/_config/namedempty.yml b/tests/core/manifest/fixtures/configmanifest/mysite/_config/namedempty.yml
new file mode 100644
index 000000000..7ce2d4818
--- /dev/null
+++ b/tests/core/manifest/fixtures/configmanifest/mysite/_config/namedempty.yml
@@ -0,0 +1,3 @@
+---
+Name: emptyconfig
+---