From 56fb00378c2ec9652b44f45fb61b67e567b64ca8 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Thu, 27 Aug 2015 00:48:54 +0200
Subject: [PATCH] Use new method for retrieving base URL

---
 admin.php | 2 +-
 api.php   | 2 +-
 index.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin.php b/admin.php
index 97b1078..fff36d4 100644
--- a/admin.php
+++ b/admin.php
@@ -23,7 +23,7 @@ $admin = new MiddlewarePipe();
 $admin->pipe($app->make('Flarum\Api\Middleware\ReadJsonParameters'));
 $admin->pipe($app->make('Flarum\Admin\Middleware\LoginWithCookieAndCheckAdmin'));
 
-$adminPath = parse_url(Core::config('admin_url'), PHP_URL_PATH);
+$adminPath = parse_url(Core::url('admin'), PHP_URL_PATH);
 $router = $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.admin.routes')]);
 
 $admin->pipe($adminPath, $router);
diff --git a/api.php b/api.php
index 533900c..8c69c26 100644
--- a/api.php
+++ b/api.php
@@ -23,7 +23,7 @@ $api = new MiddlewarePipe();
 $api->pipe($app->make('Flarum\Api\Middleware\ReadJsonParameters'));
 $api->pipe($app->make('Flarum\Api\Middleware\LoginWithHeader'));
 
-$apiPath = parse_url(Core::config('api_url'), PHP_URL_PATH);
+$apiPath = parse_url(Core::url('api'), PHP_URL_PATH);
 $router = $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.api.routes')]);
 
 $api->pipe($apiPath, $router);
diff --git a/index.php b/index.php
index e1dbbcc..bc3a6e8 100644
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@ if ($app->bound('flarum.config')) {
     $flarum->pipe($app->make('Flarum\Forum\Middleware\LoginWithCookie'));
     $flarum->pipe($app->make('Flarum\Api\Middleware\ReadJsonParameters'));
 
-    $basePath = parse_url(Core::config('base_url'), PHP_URL_PATH);
+    $basePath = parse_url(Core::url(), PHP_URL_PATH);
     $router = $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.forum.routes')]);
 
     $flarum->pipe($basePath, $router);