From 27d3bdf2dc5925473fe4ce1bf1d18bfd6cbec651 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Wed, 16 Dec 2015 21:21:48 +0100
Subject: [PATCH] Removed some old stuff

---
 sakura.php                         | 3 ---
 templates/misaki/global/master.tpl | 3 +--
 templates/yuuno/global/master.tpl  | 3 +--
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/sakura.php b/sakura.php
index 37846a7..79140ea 100644
--- a/sakura.php
+++ b/sakura.php
@@ -136,9 +136,6 @@ if (!defined('SAKURA_NO_TPL')) {
                 'path' => Config::get('cookie_path'),
             ],
 
-            'urlMain' => Config::get('url_main'),
-            'urlApi' => Config::get('url_api'),
-
             'contentPath' => Config::get('content_path'),
             'resources' => Config::get('content_path') . '/data/' . $templateName,
 
diff --git a/templates/misaki/global/master.tpl b/templates/misaki/global/master.tpl
index ede2bbc..3a68be7 100644
--- a/templates/misaki/global/master.tpl
+++ b/templates/misaki/global/master.tpl
@@ -47,7 +47,6 @@
                 },
 
                 "siteName":         "{{ sakura.siteName }}",
-                "urlMain":          "{{ sakura.urlMain }}",
                 "content":          "{{ sakura.contentPath }}",
                 "resources":        "{{ sakura.resources }}",
                 "recaptchaEnabled": "{{ sakura.recaptchaEnabled }}",
@@ -84,7 +83,7 @@
                     <ul class="site-menu">
                         <li title="Home" class="logo"><a href="{{ urls.format('SITE_HOME') }}"></a></li>
                         <li title="News"><a href="{{ urls.format('SITE_NEWS') }}" class="fa fa-newspaper-o"></a></li>
-                        <li title="Chat"><a href="//chat.{{ sakura.urlMain }}/" class="fa fa-commenting"></a></li>
+                        <li title="Chat"><a href="{{ urls.format('INFO_PAGE', ['chat']) }}" class="fa fa-commenting"></a></li>
                         <li title="Forums"><a href="{{ urls.format('FORUM_INDEX') }}" class="fa fa-comments"></a></li>
                         <li title="Members"><a href="{{ urls.format('MEMBERLIST_INDEX') }}" class="fa fa-users"></a></li>
                         <li title="Search"><a href="{{ urls.format('SITE_SEARCH') }}" class="fa fa-search"></a></li>
diff --git a/templates/yuuno/global/master.tpl b/templates/yuuno/global/master.tpl
index b0abac5..b275e82 100644
--- a/templates/yuuno/global/master.tpl
+++ b/templates/yuuno/global/master.tpl
@@ -44,7 +44,6 @@
                 },
 
                 "siteName":         "{{ sakura.siteName }}",
-                "urlMain":          "{{ sakura.urlMain }}",
                 "content":          "{{ sakura.contentPath }}",
                 "resources":        "{{ sakura.resources }}",
                 "recaptchaEnabled": "{{ sakura.recaptchaEnabled }}",
@@ -155,7 +154,7 @@
                         <!-- Navigation menu, displayed on left side of the bar. -->
                         <a class="menu-item fa-home" href="{{ urls.format('SITE_HOME') }}" title="Home"></a>
                         <a class="menu-item fa-newspaper-o" href="{{ urls.format('SITE_NEWS') }}" title="News"></a>
-                        <a class="menu-item fa-commenting" href="//chat.{{ sakura.urlMain }}/" title="Chat"></a>
+                        <a class="menu-item fa-commenting" href="{{ urls.format('INFO_PAGE', ['chat']) }}" title="Chat"></a>
                         <a class="menu-item fa-list" href="{{ urls.format('FORUM_INDEX') }}" title="Forums"></a>
                         <a class="menu-item fa-search" href="{{ urls.format('SITE_SEARCH') }}" title="Search"></a>
                         {% if session.checkLogin %}