From 95e0762e43d3e63f42f713f82cf54f6f819879c6 Mon Sep 17 00:00:00 2001 From: Henrik Andersen Date: Wed, 23 Jan 2019 15:53:51 +0100 Subject: [PATCH] Handle changes in latest DBIx::Perlish --- www/cgi-bin/tipp.cgi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/www/cgi-bin/tipp.cgi b/www/cgi-bin/tipp.cgi index 19b5427..5f465df 100755 --- a/www/cgi-bin/tipp.cgi +++ b/www/cgi-bin/tipp.cgi @@ -1564,7 +1564,8 @@ sub handle_update_group my $g : groups; $g->id == $gid; - } || "{}"; + }; + $old ||= "{}"; my $old_g = expand_permissions(eval { decode_json($old->{permissions}); } || {}); my $new_g = expand_permissions($g); @@ -1608,7 +1609,8 @@ sub handle_update_group my $g : groups; $g->id == $new_id; - } || "{}"; + }; + $new ||= "{}"; $new->{permissions} = expand_permissions(eval { decode_json($new->{permissions}); } || {}); return $new; } @@ -2256,14 +2258,16 @@ sub get_permissions $u->name eq $user; return $u->group_id; - } || $TIPP::default_group_id; + }; + $gid ||= $TIPP::default_group_id; my $json_permissions = db_fetch { my $g : groups; $g->id == $gid; return $g->permissions; - } || "{}"; + }; + $json_permissions ||= "{}"; return expand_permissions(eval { decode_json($json_permissions); } || {}); }