Skip to content

Commit

Permalink
Update to webtrees 2.1.16
Browse files Browse the repository at this point in the history
Signed-off-by: H2CK <dev@jagel.net>
  • Loading branch information
H2CK committed Jan 16, 2023
1 parent 42c1e75 commit e06e99d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static function check(): bool
*/
public static function isAdmin(UserInterface $user = null): bool
{
$user = $user ?? self::user();
$user ??= self::user();

return $user->getPreference(UserInterface::PREF_IS_ADMINISTRATOR) === '1';
}
Expand All @@ -72,7 +72,7 @@ public static function isAdmin(UserInterface $user = null): bool
*/
public static function isManager(Tree $tree, UserInterface $user = null): bool
{
$user = $user ?? self::user();
$user ??= self::user();

return self::isAdmin($user) || $tree->getUserPreference($user, UserInterface::PREF_TREE_ROLE) === UserInterface::ROLE_MANAGER;
}
Expand All @@ -87,7 +87,7 @@ public static function isManager(Tree $tree, UserInterface $user = null): bool
*/
public static function isModerator(Tree $tree, UserInterface $user = null): bool
{
$user = $user ?? self::user();
$user ??= self::user();

return
self::isManager($tree, $user) ||
Expand All @@ -104,7 +104,7 @@ public static function isModerator(Tree $tree, UserInterface $user = null): bool
*/
public static function isEditor(Tree $tree, UserInterface $user = null): bool
{
$user = $user ?? self::user();
$user ??= self::user();

return
self::isModerator($tree, $user) ||
Expand All @@ -121,7 +121,7 @@ public static function isEditor(Tree $tree, UserInterface $user = null): bool
*/
public static function isMember(Tree $tree, UserInterface $user = null): bool
{
$user = $user ?? self::user();
$user ??= self::user();

return
self::isEditor($tree, $user) ||
Expand All @@ -138,7 +138,7 @@ public static function isMember(Tree $tree, UserInterface $user = null): bool
*/
public static function accessLevel(Tree $tree, UserInterface $user = null): int
{
$user = $user ?? self::user();
$user ??= self::user();

if (self::isManager($tree, $user)) {
return self::PRIV_NONE;
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND="noninteractive" HOME="/root" LC_ALL="C.UTF-8" LANG="en_US.U
ENV supervisor_conf /etc/supervisor/supervisord.conf
ENV security_conf /etc/apache2/conf-available/security.conf
ENV start_scripts_path /bin
ENV WT_VERSION="2.1.15"
ENV WT_VERSION="2.1.16"

# Install and activate necessary software
RUN apt-get update -qq && apt-get upgrade -qy && apt-get install -qy \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.github
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG ARCH=amd64

FROM ${ARCH}/ubuntu:22.04

ARG WT_VERSION=2.1.15
ARG WT_VERSION=2.1.16
ARG QEMU_ARCH=x86_64

ARG BUILD_DATE=2021-01-01T08:00:00Z
Expand Down

0 comments on commit e06e99d

Please sign in to comment.