[Quickfw-git] SF.net Git: quickfw branch, master, updated. 6707c473238aaca477c0ac9c661a5e4a0a4e66b5

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  6707c473238aaca477c0ac9c661a5e4a0a4e66b5 (commit)
      from  f0d14feea0647d3e5dd96d188a593ef54d82b047 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6707c473238aaca477c0ac9c661a5e4a0a4e66b5
Author: Ivan Borzenkov <iva...@li...>
Date:   Fri May 20 21:22:06 2011 +0400

    Небольшой фикс конфига

diff --git a/QFW/QuickFW/Config.php b/QFW/QuickFW/Config.php
index 64b8f2b..cf6ad72 100644
--- a/QFW/QuickFW/Config.php
+++ b/QFW/QuickFW/Config.php
@@ -116,9 +116,11 @@ class QuickFW_Config implements ArrayAccess
 			$new = array();
 			if (is_file($file))
 				$new = include($file);
-			if ($new == 1 && isset($config))
+			if ($new === 1 && isset($config))
 				$new = $config;
-			$data = array_merge_replace_recursive($data, $new);
+			if (!empty($new))
+				$data = (is_array($data) && is_array($new)) ?
+					array_merge_replace_recursive($data, $new) : $new;
 		}
 		return $data;
 	}

-----------------------------------------------------------------------

Summary of changes:
 QFW/QuickFW/Config.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
quickfw