Merge branch 'master' into FixMenuButtons

oetiker · Sep 19, 2024 · da87413 · da87413
2 parents f0c8ca4 + c434c8a
commit da87413
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,9 @@
   - filter menuButtonProperties
 
+0.50.2 2024-09-18 16:42:18 +0200 Tobias Oetiker <[email protected]>
+
+ - fix regression with missing defaults for app and log in user object
+
 0.50.1 2024-08-30 12:27:22 +0200 Tobias Oetiker <[email protected]>
 
  - show a popup before reloading the page

diff --git a/lib/CallBackery.pm b/lib/CallBackery.pm
@@ -38,7 +38,7 @@ use CallBackery::Database;
 use CallBackery::User;
 use Scalar::Util qw(weaken);
 
-our $VERSION = '0.50.1';
+our $VERSION = '0.50.2';
 
 =head2 config
 

diff --git a/lib/CallBackery/User.pm b/lib/CallBackery/User.pm
@@ -35,8 +35,14 @@ the controller
 =cut
 
 has controller => undef, weak => 1;
-has app => undef, weak => 1;
-has log => undef, weak => 1;
+
+has app => sub ($self) {
+    $self->controller->app;
+}, weak => 1;
+
+has log => sub ($self) {
+    $self->controller ? $self->controller->log : $self->app->log;
+}, weak => 1;
 
 =head2 $self->userId