Explorar o código

Fixed regression introduced in 2.2.0 beta. Warning issued when opening an organization for modification

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3717 a333f486-631f-4898-b8df-5754b55c2be0
romainq %!s(int64=10) %!d(string=hai) anos
pai
achega
9628e5b4a1
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      core/dbobjectsearch.class.php

+ 1 - 1
core/dbobjectsearch.class.php

@@ -630,7 +630,7 @@ class DBObjectSearch extends DBSearch
 			}
 
 			$aAliasTranslation = array();
-			$oLeftFilter->MergeWith_InNamespace($oRightFilter, $oRet->m_aClasses, $aAliasTranslation);
+			$oLeftFilter->MergeWith_InNamespace($oRightFilter, $oLeftFilter->m_aClasses, $aAliasTranslation);
 			$oLeftFilter->TransferConditionExpression($oRightFilter, $aAliasTranslation);
 			$aSearches[] = $oLeftFilter;
 		}