diff options
| -rw-r--r-- | apps/dav/img/calendar.svg | 1 | ||||
| -rw-r--r-- | apps/settings/lib/Sections/Personal/Calendar.php | 2 | ||||
| -rw-r--r-- | lib/private/Profiler/Profiler.php | 18 |
3 files changed, 17 insertions, 4 deletions
diff --git a/apps/dav/img/calendar.svg b/apps/dav/img/calendar.svg new file mode 100644 index 00000000000..fed04535dab --- /dev/null +++ b/apps/dav/img/calendar.svg @@ -0,0 +1 @@ +<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16"><path fill="#000" d="m4 1c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm8 0c-0.5 0-1 0.5-1 1v2c0 0.5 0.5 1 1 1s1-0.5 1-1v-2c0-0.5-0.5-1-1-1zm-6.5 2v1c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-0.9375c-0.8841 0.227-1.5 1.0247-1.5 1.9375v8c0 1.108 0.892 2 2 2h10c1.108 0 2-0.892 2-2v-8c0-0.9128-0.61588-1.7105-1.5-1.9375v0.9375c0 0.831-0.5 1.5-1.5 1.5s-1.5-0.5-1.5-1.5v-1zm7.5 5v5h-10v-5z"/></svg> diff --git a/apps/settings/lib/Sections/Personal/Calendar.php b/apps/settings/lib/Sections/Personal/Calendar.php index 3f4f100e121..a7689d0fe8d 100644 --- a/apps/settings/lib/Sections/Personal/Calendar.php +++ b/apps/settings/lib/Sections/Personal/Calendar.php @@ -38,7 +38,7 @@ class Calendar implements IIconSection { } public function getIcon(): string { - return $this->urlGenerator->imagePath('core', 'caldav/time.svg'); + return $this->urlGenerator->imagePath('dav', 'calendar.svg'); } public function getID(): string { diff --git a/lib/private/Profiler/Profiler.php b/lib/private/Profiler/Profiler.php index 9fd5e76d592..40050b7bf43 100644 --- a/lib/private/Profiler/Profiler.php +++ b/lib/private/Profiler/Profiler.php @@ -61,11 +61,19 @@ class Profiler implements IProfiler { } public function loadProfile(string $token): ?IProfile { - return $this->storage->read($token); + if ($this->storage) { + return $this->storage->read($token); + } else { + return null; + } } public function saveProfile(IProfile $profile): bool { - return $this->storage->write($profile); + if ($this->storage) { + return $this->storage->write($profile); + } else { + return false; + } } public function collect(Request $request, Response $response): IProfile { @@ -88,7 +96,11 @@ class Profiler implements IProfiler { */ public function find(?string $url, ?int $limit, ?string $method, ?int $start, ?int $end, string $statusCode = null): array { - return $this->storage->find($url, $limit, $method, $start, $end, $statusCode); + if ($this->storage) { + return $this->storage->find($url, $limit, $method, $start, $end, $statusCode); + } else { + return []; + } } public function dataProviders(): array { |
