From 0bced2f9aee7b2099d4071b4b48efc96e9a7ca2b Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Thu, 12 Sep 2013 08:09:15 +0000
Subject: [PATCH] ModelFactory: needed / define_if_not_exists were not
 equivalent

SVN:trunk[2850]
---
 setup/modelfactory.class.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup/modelfactory.class.inc.php b/setup/modelfactory.class.inc.php
index 036d08ca0..991cbb427 100644
--- a/setup/modelfactory.class.inc.php
+++ b/setup/modelfactory.class.inc.php
@@ -325,6 +325,7 @@ class ModelFactory
 			{
 				$oTargetNode = $oExistingNode;
 			}
+			$oTargetNode->setAttribute('_alteration', 'needed');
 			break;
 			
 		case 'define':
@@ -1150,6 +1151,7 @@ EOF
 			{
 				case 'added':
 				case 'replaced':
+				case 'needed':
 				// marked as added or modified, just reset the flag
 				$oNode->removeAttribute('_alteration');
 				break;
@@ -1924,6 +1926,7 @@ class MFElement extends DOMElement
 			$sFlag = 'removed';
 			break;
 		case 'added':
+		case 'needed':
 			$sFlag = null;
 			break;
 		case 'removed':
@@ -2069,6 +2072,7 @@ class MFElement extends DOMElement
 			{
 				case 'added':
 				case 'replaced':
+				case 'needed':
 				// marked as added or modified, just reset the flag
 				$oNode->removeAttribute('_alteration');
 				break;