diff options
| author | czaks <marcin@6irc.net> | 2013-07-16 13:02:13 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-16 13:02:13 -0400 |
| commit | 7bdb96a16b51eb8086fead11783bb095ea42cd90 (patch) | |
| tree | b236bbd6082d927e25ecf4b07ea45bb5e1206a60 /templates/thread.html | |
| parent | 8a598982a4f6ae48ad6e2a4d634314215871c4c1 (diff) | |
| parent | aadb57f2a2db9210468f25d7dcd45d561ef6ad54 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
install.php
templates/index.html
templates/thread.html
Diffstat (limited to 'templates/thread.html')
| -rw-r--r-- | templates/thread.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/thread.html b/templates/thread.html index b8c54dec..1b217c2f 100644 --- 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 }}
|