Merge pull request #741 from Albert221/prefix-fix

UrlGenerator prefix fix.

src/Admin/UrlGenerator.php

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

src/Api/UrlGenerator.php

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

src/Http/AbstractUrlGenerator.php

@@ -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);
+        return $this->app->url($this->path);
-
-        if (empty($this->prefix)) {
-            return $base;
-        } else {
-            return $base . '/' . $this->prefix;
-        }
     }
 }