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

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source
This commit is contained in:
Pierre Goiffon
2022-12-15 15:36:43 +01:00
parent 6d47b0f4f8 0d49c605e2
commit cb6232cc05
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/dbsearch.class.php
View File

@@ -773,14 +773,14 @@ abstract class DBSearch
* @see DBSearch::ToOQL() * @see DBSearch::ToOQL()
* *
* @param string $sQuery The OQL to convert to a DBSearch * @param string $sQuery The OQL to convert to a DBSearch
* @param mixed[string] $aParams array of <mixed> params index by <string> name * @param array $aParams array of <mixed> params index by <string> name
* @param ModelReflection|null $oMetaModel The MetaModel to use when checking the consistency of the OQL * @param ModelReflection|null $oMetaModel The MetaModel to use when checking the consistency of the OQL
* *
* @return DBObjectSearch|DBUnionSearch * @return DBObjectSearch|DBUnionSearch
* *
* @throws OQLException * @throws OQLException
*/ */
static public function FromOQL($sQuery, $aParams = null, ModelReflection $oMetaModel=null) public static function FromOQL($sQuery, $aParams = null, ModelReflection $oMetaModel=null)
{ {
if (empty($sQuery)) if (empty($sQuery))
{ {