From b5d440519654dc171c171e2161416dd75db3cd05 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Sun, 13 Sep 2015 14:27:12 +0200
Subject: Decomplexify ConfigParser->buildAlbumConfig

---
 config/configparser.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/configparser.php b/config/configparser.php
index 852ceb90..f6e0db85 100644
--- a/config/configparser.php
+++ b/config/configparser.php
@@ -146,8 +146,7 @@ class ConfigParser {
 	 */
 	private function buildAlbumConfig($currentConfig, $parsedConfig, $completionStatus, $level) {
 		foreach ($completionStatus as $key => $complete) {
-			if (!empty($parsedConfig[$key])
-				&& !$this->isConfigItemComplete($key, $parsedConfig, $complete)
+			if (!$this->isConfigItemComplete($key, $parsedConfig, $complete)
 			) {
 				$parsedConfigItem = $parsedConfig[$key];
 				if ($this->isConfigUsable($parsedConfigItem, $level)) {
@@ -172,7 +171,9 @@ class ConfigParser {
 	 * @return bool
 	 */
 	private function isConfigItemComplete($key, $parsedConfig, $complete) {
-		return !(!$complete && array_key_exists($key, $parsedConfig));
+		return !(!$complete
+				 && array_key_exists($key, $parsedConfig)
+				 && !empty($parsedConfig[$key]));
 	}
 
 	/**
-- 
cgit v1.2.3