github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-19 18:12:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #741 from Albert221/prefix-fix

Browse Source 
UrlGenerator prefix fix.
This commit is contained in:
Toby Zerner 2016-01-13 08:17:10 +10:30
commit a4a1fa69b1
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/src/Admin/UrlGenerator.php
View File

@ -14,5 +14,8 @@ use Flarum\Http\AbstractUrlGenerator;
class UrlGenerator extends AbstractUrlGenerator
{
/**
* {@inheritdoc}
*/
protected $path = 'admin';
}

2
framework/core/src/Api/UrlGenerator.php
View File

@ -17,5 +17,5 @@ class UrlGenerator extends AbstractUrlGenerator
/**
* {@inheritdoc}
*/
protected $prefix = 'api';
protected $path = 'api';
}

13
framework/core/src/Http/AbstractUrlGenerator.php
View File

@ -30,11 +30,6 @@ class AbstractUrlGenerator
*/
protected $path;
/**
* @var string
*/
protected $prefix = '';
/**
* @param Application $app
* @param RouteCollection $routes
@ -78,12 +73,6 @@ class AbstractUrlGenerator
*/
public function toBase()
{
$base = $this->app->url($this->path);
if (empty($this->prefix)) {
return $base;
} else {
return $base . '/' . $this->prefix;
}
return $this->app->url($this->path);
}
}