Merge branch 'master' of https://github.com/kaernyk/vichan

Conflicts:
	stylesheets/style.css

1 files changed, 2 insertions, 8 deletions

diff --git a/js/catalog-link.js b/js/catalog-link.js
index 5c5d9b13..05ee9efb 100644
--- a/js/catalog-link.js
+++ b/js/catalog-link.js
@@ -15,13 +15,8 @@
 function catalog() {
 var board = $("input[name='board']");
 
-if (board.length>0) { 
-if (window.location.pathname.indexOf("/res/")>0){ //if we are inside a thread
-var catalog_url = '../catalog.html';
-}
-else {
-var catalog_url = 'catalog.html';
-}
+var catalog_url = configRoot + board.first().val() + "/catalog.html";
+
 var pages = document.getElementsByClassName('pages')[0];
 var bottom = document.getElementsByClassName('boardlist bottom')[0]
 var subtitle = document.getElementsByClassName('subtitle')[0];
@@ -57,7 +52,6 @@ if (subtitle) {
 	subtitle.appendChild(link2);	
 }
 }
-}
 
 if (active_page == 'thread' || active_page == 'index') {
 	$(document).ready(catalog);