replace GPL diff lib with MIT lib

[bookstack] / app / helpers.php

diff --git a/app/helpers.php b/app/helpers.php
index b8f61d94e3fde57f757c115b5f45c4fa0dc84080..42e4c189476c8669a2d8bd336a7c9b84a7223df2 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,5 +1,7 @@
 <?php
 
 <?php
 

+use BookStack\Ownable;
+

 if (!function_exists('versioned_asset')) {
     /**
      * Get the path to a versioned file.
 if (!function_exists('versioned_asset')) {
     /**
      * Get the path to a versioned file.


@@ -34,18 +36,18 @@ if (!function_exists('versioned_asset')) {
  * If an ownable element is passed in the jointPermissions are checked against
  * that particular item.
  * @param $permission
  * If an ownable element is passed in the jointPermissions are checked against
  * that particular item.
  * @param $permission

- * @param \BookStack\Ownable $ownable
+ * @param Ownable $ownable

  * @return mixed
  */
  * @return mixed
  */

-function userCan($permission, \BookStack\Ownable $ownable = null)
+function userCan($permission, Ownable $ownable = null)

 {
     if ($ownable === null) {
         return auth()->user() && auth()->user()->can($permission);
     }
 
     // Check permission on ownable item
 {
     if ($ownable === null) {
         return auth()->user() && auth()->user()->can($permission);
     }
 
     // Check permission on ownable item

-    $permissionService = app('BookStack\Services\PermissionService');
-    return $permissionService->checkEntityUserAccess($ownable, $permission);
+    $permissionService = app(\BookStack\Services\PermissionService::class);
+    return $permissionService->checkOwnableUserAccess($ownable, $permission);

 }
 
 /**
 }
 
 /**