Przeglądaj źródła

Bug fix: AddToDashboard crashed the menu.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2218 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 12 lat temu
rodzic
commit
c1d7824a0e
2 zmienionych plików z 4 dodań i 3 usunięć
  1. 2 1
      core/dbobjectsearch.class.php
  2. 2 2
      core/metamodel.class.php

+ 2 - 1
core/dbobjectsearch.class.php

@@ -921,6 +921,7 @@ class DBObjectSearch
 			{
 				$aParams = array_merge($aContextParams, $this->m_aParams);
 			}
+			$aParams = MetaModel::PrepareQueryArguments($aParams);
 		}
 		else
 		{
@@ -1287,4 +1288,4 @@ class DBObjectSearch
 }
 
 
-?>
+?>

+ 2 - 2
core/metamodel.class.php

@@ -1976,7 +1976,7 @@ abstract class MetaModel
 
 	protected static $m_aQueryStructCache = array();
 
-	protected static function PrepareQueryArguments($aArgs)
+	public static function PrepareQueryArguments($aArgs)
 	{
 		// Translate any object into scalars
 		//
@@ -4994,4 +4994,4 @@ MetaModel::RegisterZList("preview", array("description"=>"All attributes visible
 MetaModel::RegisterZList("standard_search", array("description"=>"List of criteria for the standard search", "type"=>"filters"));
 MetaModel::RegisterZList("advanced_search", array("description"=>"List of criteria for the advanced search", "type"=>"filters"));
 
-?>
+?>