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

Conflicts: install.php templates/index.html templates/thread.html
2013-07-16 13:02:13 -04:00
parent 8a598982a4 aadb57f2a2
commit 7bdb96a16b
15 changed files with 110 additions and 39 deletions
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -8,7 +8,7 @@
 	</script>

 	{% include 'header.html' %}
-	<title>{{ board.url }} - {{ board.name }}</title>
+	<title>{{ board.url }} - {% if config.thread_subject_in_title and thread.subject %}{{ thread.subject }}{% else %}{{ board.title|e }}{% endif %}</title>
 </head>
 <body>
 	{{ boardlist.top }}