kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Merge 4.5

Browse Source 
Conflicts:
	post.php
This commit is contained in:
czaks 2014-06-20 23:35:45 +02:00
commit 26884e8e11
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/functions.php
View File

@ -215,6 +215,8 @@ function loadConfig() {
error_reporting(E_ALL); error_reporting(E_ALL);
ini_set('display_errors', true); ini_set('display_errors', true);
ini_set('html_errors', false); ini_set('html_errors', false);
} else {
ini_set('display_errors', false);
} }
// Keep the original address to properly comply with other board configurations // Keep the original address to properly comply with other board configurations

12
templates/themes/basic/index.html
View File

@ -2,10 +2,14 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta charset="utf-8">
<meta name="viewport" content="width=device-width" />
<title>{{ settings.title }}</title> <title>{{ settings.title }}</title>
<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}"/> {% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
{% if config.url_favicon %}<link rel="shortcut icon" href="{{ config.url_favicon }}">{% endif %}
<link rel="stylesheet" media="screen" href="{{ config.url_stylesheet }}">
{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
{% if config.font_awesome %}<link rel="stylesheet" href="{{ config.root }}{{ config.font_awesome_css }}">{% endif %}
</head> </head>
<body> <body>
{{ boardlist.top }} {{ boardlist.top }}
@ -25,7 +29,7 @@
{% else %} {% else %}
<em>no subject</em> <em>no subject</em>
{% endif %} {% endif %}
<span class="unimportant"> &mdash; by {{ entry.name }} at {{ entry.time|date(config.post_date) }}</span> <span class="unimportant"> &mdash; by {{ entry.name }} at {{ entry.time|date(config.post_date, config.timezone) }}</span>
</h2> </h2>
<p>{{ entry.body }}</p> <p>{{ entry.body }}</p>
{% endfor %} {% endfor %}