extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Handler::etag(): Argument #1 ($entry) must be of type array, null given

Browse Source
This commit is contained in:
ralf 2024-05-02 11:10:55 +02:00
parent bd6a4c310d
commit 3be8edc44a
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/CalDAV/Handler.php
View File

@ -203,7 +203,7 @@ abstract class Handler
*
* @param string|int $id
* @param string $path =null implementation can use it, used in call from _common_get_put_delete
* @return array|boolean array with entry, false if no read rights, null if $id does not exist
* @return array|false|null array with entry, false if no read rights, null if $id does not exist
*/
abstract function read($id /*,$path=null*/);
@ -247,7 +247,7 @@ abstract class Handler
* Get the etag for an entry, can be reimplemented for other algorithm or field names
*
* @param array|int $entry array with event or cal_id
* @return string|boolean string with etag or false
* @return string|false string with etag or false
*/
function get_etag($entry)
{
@ -255,7 +255,7 @@ abstract class Handler
{
$entry = $this->read($entry);
}
return static::etag($entry);
return $entry ? static::etag($entry) : false;
}
/**
@ -266,7 +266,7 @@ abstract class Handler
*/
public static function etag(array $entry)
{
if (!is_array($entry) || !isset($entry['id']) || !(isset($entry['modified']) || isset($entry['etag'])))
if (!isset($entry['id']) || !(isset($entry['modified']) || isset($entry['etag'])))
{
// error_log(__METHOD__."(".array2string($entry).") Cant create etag!");
return false;