Merge branch 'master' of http://github.com/ctrlcctrlv/Tinyboard

1 files changed, 6 insertions, 1 deletions

diff --git a/js/catalog-link.js b/js/catalog-link.js
index cc55eb52..124a3e9a 100644
--- a/js/catalog-link.js
+++ b/js/catalog-link.js
@@ -3,8 +3,13 @@
 function catalog() {
 var board = $("input[name='board']");
 
-if (board) { 
+if (board.length>0) { 
+if (window.location.href.indexOf("/res/")==-1){ //if we are inside a thread
 var catalog_url = 'catalog.html';
+}
+else {
+var catalog_url = '../catalog.html';
+}
 var pages = document.getElementsByClassName('pages')[0];
 var bottom = document.getElementsByClassName('boardlist bottom')[0]
 var subtitle = document.getElementsByClassName('subtitle')[0];