Merge branch 'mod-rewrite'

Conflicts:
	inc/lib/Twig/Extensions/Extension/Tinyboard.php
	install.php
	mod.php
	stylesheets/style.css
	templates/index.html
	templates/page.html
	templates/thread.html

1 files changed, 5 insertions, 6 deletions

diff --git a/templates/thread.html b/templates/thread.html
index ac6bc609..e7c65f9b 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -1,11 +1,11 @@
 <!doctype html>

 <html>

 <head>

+	<meta charset="utf-8">

 	<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">

 	{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}

 	<title>{{ board.url }} - {{ board.name }}</title>

-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">

-	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes">

+	<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">

 	{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}

 	{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}

 	{% if not nojavascript %}

@@ -29,17 +29,16 @@
 			display: block;

 		}

 	{% endraw %}</style>{% endif %}

-

 </head>

 <body>

 	{{ boardlist.top }}

 	{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}

 	{% if config.url_banner %}<img class="banner" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}

 	<header>

-		<h1>{{ board.url }} - {{ board.name }}</h1>

+		<h1>{{ board.url }} - {{ board.title|e }}</h1>

 		<div class="subtitle">

-			{% if board.title %}

-				{{ board.title }}

+			{% if board.subtitle %}

+				{{ board.subtitle|e }}

 			{% endif %}

 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}

 		</div>