extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-16 02:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

do NOT fail with TypeError, if order_by is NULL, it's harmless ;)

Browse Source
This commit is contained in:
ralf 2024-07-01 10:26:53 +02:00
parent 0c6e9ac77f
commit 2a87ebdbe6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/Storage/Base.php
View File

@ -1079,18 +1079,18 @@ class Base
/** /**
* Sanitize (currently just remove) not understood ORDER BY clause * Sanitize (currently just remove) not understood ORDER BY clause
* *
* @param string $fragment SQL fragment containing ORDER BY clause, could also contain GROUP BY etc * @param ?string $fragment SQL fragment containing ORDER BY clause, could also contain GROUP BY etc
* @return string sanitized version of $_order_by * @return string sanitized version of $_order_by
*/ */
static function sanitizeOrderBy(string $fragment) static function sanitizeOrderBy(?string $fragment)
{ {
// check fragment contains ORDER BY --> just operate on what's behind // check fragment contains ORDER BY --> just operate on what's behind
if (stripos($fragment,'ORDER BY') !== false) if ($fragment && stripos($fragment,'ORDER BY') !== false)
{ {
[$group_by, $order_by] = preg_split('/order +by +/i', $fragment); [$group_by, $order_by] = preg_split('/order +by +/i', $fragment);
} }
// check fragment not just contain GROUP BY or HAVING --> nothing to do // check fragment not just contain GROUP BY or HAVING --> nothing to do
elseif ($fragment === '' || stripos($fragment,'GROUP BY')!==false || stripos($fragment,'HAVING')!==false) elseif (empty($fragment) || stripos($fragment,'GROUP BY')!==false || stripos($fragment,'HAVING')!==false)
{ {
return $fragment; return $fragment;
} }