mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-23 17:51:24 +02:00
Code Issues Releases Wiki Activity

Fix asset URL generation

Browse Source 
This is important when Flarum is deployed in a subfolder.

Closes #291.
This commit is contained in:
Franz Liedke
2015-08-29 22:38:31 +02:00
parent f5d2d2ff79
commit 1d1cc9e443
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Users/User.php
View File

@@ -306,7 +306,7 @@ class User extends Model
{ {
$urlGenerator = app('Flarum\Http\UrlGeneratorInterface'); $urlGenerator = app('Flarum\Http\UrlGeneratorInterface');
return $this->avatar_path ? $urlGenerator->toAsset('assets/avatars/'.$this->avatar_path) : null; return $this->avatar_path ? $urlGenerator->toAsset('avatars/'.$this->avatar_path) : null;
} }
/** /**

7
src/Http/UrlGenerator.php
View File

@@ -11,6 +11,8 @@
namespace Flarum\Http; namespace Flarum\Http;
use Flarum\Core;
class UrlGenerator implements UrlGeneratorInterface class UrlGenerator implements UrlGeneratorInterface
{ {
protected $routes; protected $routes;
@@ -26,12 +28,11 @@ class UrlGenerator implements UrlGeneratorInterface
$path = $this->routes->getPath($name, $parameters); $path = $this->routes->getPath($name, $parameters);
$path = ltrim($path, '/'); $path = ltrim($path, '/');
// TODO: Prepend real base URL return Core::url() . "/$path";
return "/$path";
} }
public function toAsset($path) public function toAsset($path)
{ {
return "/$path"; return Core::url() . "/assets/$path";
} }
} }