Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html

1 files changed, 1 insertions, 1 deletions

diff --git a/js/catalog-link.js b/js/catalog-link.js
index a8b8a0a8..cc55eb52 100644
--- a/js/catalog-link.js
+++ b/js/catalog-link.js
@@ -3,7 +3,7 @@
 function catalog() {
 var board = $("input[name='board']");
 
-if (board.length>0) { 
+if (board) { 
 var catalog_url = 'catalog.html';
 var pages = document.getElementsByClassName('pages')[0];
 var bottom = document.getElementsByClassName('boardlist bottom')[0]