diff options
| author | czaks <marcin@6irc.net> | 2014-06-20 23:35:45 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-06-20 23:35:45 +0200 |
| commit | 26884e8e11fc3430d05d23555c78bc05f3fb1721 (patch) | |
| tree | 3d26ba4b4340d50d4d6c445423c935ce71d30008 | |
| parent | 2c883fda0a25aaef801e6e1a6274d1912ac8cbab (diff) | |
| parent | 73177fcffc040d1c225782fe85f09576a39f6890 (diff) | |
Merge 4.5
Conflicts:
post.php
| -rw-r--r-- | inc/functions.php | 2 | ||||
| -rw-r--r-- | templates/themes/basic/index.html | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/inc/functions.php b/inc/functions.php index 35a3cc2f..db9c91b0 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -215,6 +215,8 @@ function loadConfig() { error_reporting(E_ALL); ini_set('display_errors', true); ini_set('html_errors', false); + } else { + ini_set('display_errors', false); } // Keep the original address to properly comply with other board configurations diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html index 6178d4a9..3376a68f 100644 --- a/templates/themes/basic/index.html +++ b/templates/themes/basic/index.html @@ -2,10 +2,14 @@ <!doctype html> <html> <head> - <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> - <meta name="viewport" content="width=device-width" /> + <meta charset="utf-8"> <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> <body> {{ boardlist.top }} @@ -25,7 +29,7 @@ {% else %} <em>no subject</em> {% endif %} - <span class="unimportant"> — by {{ entry.name }} at {{ entry.time|date(config.post_date) }}</span> + <span class="unimportant"> — by {{ entry.name }} at {{ entry.time|date(config.post_date, config.timezone) }}</span> </h2> <p>{{ entry.body }}</p> {% endfor %} |