aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2020-11-10 10:46:04 +0100
committerGitHub <noreply@github.com>2020-11-10 10:46:04 +0100
commit302662797cb5e8ac6579a99297ceae301f7927a6 (patch)
tree67f493a1cc6d3691742946f1d7e512bffe41e02f /index.php
parentc94c32d1a3e86a479cb2582eadc668a5bb476fc6 (diff)
parent2f4df753041088d788d1923692a7d530167a6840 (diff)
downloadShaarli-302662797cb5e8ac6579a99297ceae301f7927a6.tar.gz
Shaarli-302662797cb5e8ac6579a99297ceae301f7927a6.tar.zst
Shaarli-302662797cb5e8ac6579a99297ceae301f7927a6.zip
Merge pull request #1635 from ArthurHoaro/feature/phpcs
Diffstat (limited to 'index.php')
-rw-r--r--index.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/index.php b/index.php
index 8fe86236..1eb7659a 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,5 @@
1<?php 1<?php
2
2/** 3/**
3 * Shaarli - The personal, minimalist, super-fast, database free, bookmarking service. 4 * Shaarli - The personal, minimalist, super-fast, database free, bookmarking service.
4 * 5 *
@@ -77,9 +78,9 @@ if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
77new Languages(setlocale(LC_MESSAGES, 0), $conf); 78new Languages(setlocale(LC_MESSAGES, 0), $conf);
78 79
79$conf->setEmpty('general.timezone', date_default_timezone_get()); 80$conf->setEmpty('general.timezone', date_default_timezone_get());
80$conf->setEmpty('general.title', t('Shared bookmarks on '). escape(index_url($_SERVER))); 81$conf->setEmpty('general.title', t('Shared bookmarks on ') . escape(index_url($_SERVER)));
81 82
82RainTPL::$tpl_dir = $conf->get('resource.raintpl_tpl').'/'.$conf->get('resource.theme').'/'; // template directory 83RainTPL::$tpl_dir = $conf->get('resource.raintpl_tpl') . '/' . $conf->get('resource.theme') . '/'; // template directory
83RainTPL::$cache_dir = $conf->get('resource.raintpl_tmp'); // cache directory 84RainTPL::$cache_dir = $conf->get('resource.raintpl_tmp'); // cache directory
84 85
85date_default_timezone_set($conf->get('general.timezone', 'UTC')); 86date_default_timezone_set($conf->get('general.timezone', 'UTC'));
@@ -177,6 +178,6 @@ try {
177} catch (Throwable $e) { 178} catch (Throwable $e) {
178 die(nl2br( 179 die(nl2br(
179 'An unexpected error happened, and the error template could not be displayed.' . PHP_EOL . PHP_EOL . 180 'An unexpected error happened, and the error template could not be displayed.' . PHP_EOL . PHP_EOL .
180 exception2text($e) 181 exception2text($e)
181 )); 182 ));
182} 183}