composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°3653 - Remove parameter for \DBObjectSearch::GetQueryParams

Browse Source
This commit is contained in:
Anne-Cath
2025-08-01 10:05:23 +02:00
parent d3e450c54e
commit 7b95d65f60
3 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/dbobjectsearch.class.php
View File

@@ -1373,44 +1373,41 @@ class DBObjectSearch extends DBSearch
$this->m_aParams[$sKey] = $value;
}
public function GetQueryParams($bExcludeMagicParams = true)
public function GetQueryParams()
{
$aParams = array();
$this->m_oSearchCondition->RenderExpression(false, $aParams, true);
if ($bExcludeMagicParams)
{
$aRet = array();
$aRet = array();
// Make the list of acceptable arguments... could be factorized with run_query, into oSearch->GetQueryParams($bExclude magic params)
$aNakedMagicArguments = array();
foreach (MetaModel::PrepareQueryArguments(array(),array(), $this->GetExpectedArguments()) as $sArgName => $value)
// Make the list of acceptable arguments... could be factorized with run_query, into oSearch->GetQueryParams()
$aNakedMagicArguments = array();
foreach (MetaModel::PrepareQueryArguments(array(),array(), $this->GetExpectedArguments()) as $sArgName => $value)
{
$iPos = strpos($sArgName, '->object()');
if ($iPos === false)
{
$iPos = strpos($sArgName, '->object()');
if ($iPos === false)
{
$aNakedMagicArguments[$sArgName] = $value;
}
else
{
$aNakedMagicArguments[substr($sArgName, 0, $iPos)] = true;
}
$aNakedMagicArguments[$sArgName] = $value;
}
foreach ($aParams as $sParam => $foo)
else
{
$iPos = strpos($sParam, '->');
if ($iPos === false)
{
$sRefName = $sParam;
}
else
{
$sRefName = substr($sParam, 0, $iPos);
}
if (!array_key_exists($sRefName, $aNakedMagicArguments))
{
$aRet[$sParam] = $foo;
}
$aNakedMagicArguments[substr($sArgName, 0, $iPos)] = true;
}
}
foreach ($aParams as $sParam => $foo)
{
$iPos = strpos($sParam, '->');
if ($iPos === false)
{
$sRefName = $sParam;
}
else
{
$sRefName = substr($sParam, 0, $iPos);
}
if (!array_key_exists($sRefName, $aNakedMagicArguments))
{
$aRet[$sParam] = $foo;
}
}

4
core/dbsearch.class.php
View File

@@ -533,11 +533,9 @@ abstract class DBSearch
/**
* @internal
*
* @param bool $bExcludeMagicParams
*
* @return mixed
*/
abstract public function GetQueryParams($bExcludeMagicParams = true);
abstract public function GetQueryParams();
/**
* @internal

4
core/dbunionsearch.class.php
View File

@@ -479,12 +479,12 @@ class DBUnionSearch extends DBSearch
return $aParams;
}
public function GetQueryParams($bExcludeMagicParams = true)
public function GetQueryParams()
{
$aParams = array();
foreach ($this->aSearches as $oSearch)
{
$aParams = array_merge($oSearch->GetQueryParams($bExcludeMagicParams), $aParams);
$aParams = array_merge($oSearch->GetQueryParams(), $aParams);
}
return $aParams;
}