From f11070dcf0ee65f31e865d0a3a35b4bf7fff0dd2 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sun, 28 Aug 2016 22:15:26 +0800
Subject: [PATCH] fix relative urls

---
 app/Services/Http.php              | 11 -----------
 resources/views/skinlib/item.tpl   |  4 ++--
 resources/views/skinlib/master.tpl |  2 +-
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/Services/Http.php b/app/Services/Http.php
index d4356b3f..9f305145 100644
--- a/app/Services/Http.php
+++ b/app/Services/Http.php
@@ -82,17 +82,6 @@ class Http
         return self::getBaseUrl().$_SERVER["REQUEST_URI"];
     }
 
-    /**
-     * Generate absolute url according to relative one
-     *
-     * @param  string $relative
-     * @return string
-     */
-    public static function urlTo($relative)
-    {
-        return Option::get('site_url').$relative;
-    }
-
     public static function abort($code, $msg = "Something happened.", $is_json = false)
     {
         http_response_code((int)$code);
diff --git a/resources/views/skinlib/item.tpl b/resources/views/skinlib/item.tpl
index 54b2d5cb..88b56ef6 100644
--- a/resources/views/skinlib/item.tpl
+++ b/resources/views/skinlib/item.tpl
@@ -1,6 +1,6 @@
 <div class="item" tid="{{ $texture['tid'] }}">
     <div class="item-body">
-        <img src="{{ Http::urlTo('/preview/'.$texture['tid'].'.png') }}">
+        <img src="{{ url('preview/'.$texture['tid'].'.png') }}">
     </div>
 
     <div class="item-footer">
@@ -9,7 +9,7 @@
         </p>
 
 
-        @if (session()->has('uid'))
+        @if (Session::has('uid'))
 
             @if ($user->closet->has($texture['tid']))
             <a title="从衣柜中移除" class="more like liked" tid="{{ $texture['tid'] }}" href="javascript:removeFromCloset({{ $texture['tid'] }});" data-placement="top" data-toggle="tooltip"><i class="fa fa-heart"></i></a>
diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.tpl
index a0f5a787..dc893a02 100644
--- a/resources/views/skinlib/master.tpl
+++ b/resources/views/skinlib/master.tpl
@@ -75,7 +75,7 @@
                     <!-- Navbar Right Menu -->
                         <div class="navbar-custom-menu">
                             <ul class="nav navbar-nav">
-                                <li><a href="{{ Http::urlTo('/skinlib/upload') }}"><i class="fa fa-upload" aria-hidden="true"></i> 上传新皮肤</a></li>
+                                <li><a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload" aria-hidden="true"></i> 上传新皮肤</a></li>
                                 @if (!is_null($user))
                                 <!-- User Account Menu -->
                                 <li class="dropdown user user-menu">