Merge branch 'v0.24-dev'

diff --combined app/helpers.php
index 9f2f74c18a82c944f0ff01ccfe2a310fd956c5f9,4c0521d3a0c65c71785dc065ef834ec3956e631b..aca832ea51656434c84079069ef35da4747051a0
--- 1/app/helpers.php
--- 2/app/helpers.php
+++ b/app/helpers.php
@@@ -30,11 -30,11 +30,11 @@@ function versioned_asset($file = ''
  /**
   * Helper method to get the current User.
   * Defaults to public 'Guest' user if not logged in.
 - * @return \BookStack\User
 + * @return \BookStack\Auth\User
   */
  function user()
  {
 -    return auth()->user() ?: \BookStack\User::getDefault();
 +    return auth()->user() ?: \BookStack\Auth\User::getDefault();
  }
  
  /**
@@@ -61,7 -61,7 +61,7 @@@ function userCan($permission, Ownable $
      }
  
      // Check permission on ownable item
 -    $permissionService = app(\BookStack\Services\PermissionService::class);
 +    $permissionService = app(\BookStack\Auth\Permissions\PermissionService::class);
      return $permissionService->checkOwnableUserAccess($ownable, $permission);
  }
  
@@@ -69,11 -69,11 +69,11 @@@
   * Helper to access system settings.
   * @param $key
   * @param bool $default
 - * @return bool|string|\BookStack\Services\SettingService
 + * @return bool|string|\BookStack\Settings\SettingService
   */
  function setting($key = null, $default = false)
  {
 -    $settingService = resolve(\BookStack\Services\SettingService::class);
 +    $settingService = resolve(\BookStack\Settings\SettingService::class);
      if (is_null($key)) {
          return $settingService;
      }
@@@ -92,10 -92,15 +92,15 @@@ function baseUrl($path, $forceAppDomai
      if ($isFullUrl && !$forceAppDomain) {
          return $path;
      }
+ 
      $path = trim($path, '/');
+     $trimBase = rtrim(config('app.url'), '/');
  
      // Remove non-specified domain if forced and we have a domain
      if ($isFullUrl && $forceAppDomain) {
+         if (strpos($path, $trimBase) === 0) {
+             $path = trim(substr($path, strlen($trimBase) - 1));
+         }
          $explodedPath = explode('/', $path);
          $path = implode('/', array_splice($explodedPath, 3));
      }
@@@ -105,7 -110,7 +110,7 @@@
          return url($path);
      }
  
-     return rtrim(config('app.url'), '/') . '/' . $path;
+     return $trimBase . '/' . $path;
  }
  
  /**