Page Attachments - Improved UI, Now initially complete

[bookstack] / app / helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index dd835fbf64755adb17a0568902cff00cd7a75c4f..ad1c7dd20ce1b0a5f38ad7d9ce5b267d7f92f30c 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -36,6 +36,16 @@ function versioned_asset($file = '')
     throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
 }
 
+/**
+ * Helper method to get the current User.
+ * Defaults to public 'Guest' user if not logged in.
+ * @return \BookStack\User
+ */
+function user()
+{
+    return auth()->user() ?: \BookStack\User::getDefault();
+}
+
 /**
  * Check if the current user has a permission.
  * If an ownable element is passed in the jointPermissions are checked against
@@ -47,7 +57,7 @@ function versioned_asset($file = '')
 function userCan($permission, Ownable $ownable = null)
 {
     if ($ownable === null) {
-        return auth()->user() && auth()->user()->can($permission);
+        return user() && user()->can($permission);
     }
 
     // Check permission on ownable item