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, 3 insertions, 3 deletions

diff --git a/templates/page.html b/templates/page.html
index 0b15d815..0f59e6b1 100644
--- a/templates/page.html
+++ b/templates/page.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>{{ title }}</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.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}

 	{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}

 </head>

@@ -17,7 +17,7 @@
 			{% if subtitle %}

 				{{ subtitle }}

 			{% endif %}

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

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

 		</div>

 	</header>

 	{{ body }}