aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSébastien SAUVAGE <sebsauvage@sebsauvage.net>2013-03-11 01:59:48 -0700
committerSébastien SAUVAGE <sebsauvage@sebsauvage.net>2013-03-11 01:59:48 -0700
commit87e3d65023ae382ec7cabd904dd070a9242e6bb8 (patch)
tree15404110fd2e1fe1e8562e8599deaa52e765404f
parent2d21a179b0528ec74af3e832fea489147cc7797f (diff)
parent6e330f2225c41cee4a8296913b1c02cf9b380212 (diff)
downloadShaarli-87e3d65023ae382ec7cabd904dd070a9242e6bb8.tar.gz
Shaarli-87e3d65023ae382ec7cabd904dd070a9242e6bb8.tar.zst
Shaarli-87e3d65023ae382ec7cabd904dd070a9242e6bb8.zip
Merge pull request #42 from matchab/master
Timezone par défaut
-rw-r--r--.gitignore13
-rw-r--r--index.php6
2 files changed, 15 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index f40099f5..bcd745e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,10 @@
1# Ignore data/, tmp/, cache/ and pagecache/ 1# Ignore data/, tmp/, cache/ and pagecache/
2data/ 2data
3tmp/ 3tmp
4cache/ 4cache
5pagecache/ 5pagecache
6
7# Eclipse project files
8.settings
9.buildpath
10.project \ No newline at end of file
diff --git a/index.php b/index.php
index 4c3a3a4d..1d13e55c 100644
--- a/index.php
+++ b/index.php
@@ -5,6 +5,12 @@
5// Licence: http://www.opensource.org/licenses/zlib-license.php 5// Licence: http://www.opensource.org/licenses/zlib-license.php
6// Requires: php 5.1.x (but autocomplete fields will only work if you have php 5.2.x) 6// Requires: php 5.1.x (but autocomplete fields will only work if you have php 5.2.x)
7// ----------------------------------------------------------------------------------------------- 7// -----------------------------------------------------------------------------------------------
8// NEVER TRUST IN PHP.INI
9// Some hosts do not define a default timezone in php.ini,
10// so we have to do this for avoid the strict standard error.
11date_default_timezone_set('UTC');
12
13// -----------------------------------------------------------------------------------------------
8// Hardcoded parameter (These parameters can be overwritten by creating the file /config/options.php) 14// Hardcoded parameter (These parameters can be overwritten by creating the file /config/options.php)
9$GLOBALS['config']['DATADIR'] = 'data'; // Data subdirectory 15$GLOBALS['config']['DATADIR'] = 'data'; // Data subdirectory
10$GLOBALS['config']['CONFIG_FILE'] = $GLOBALS['config']['DATADIR'].'/config.php'; // Configuration file (user login/password) 16$GLOBALS['config']['CONFIG_FILE'] = $GLOBALS['config']['DATADIR'].'/config.php'; // Configuration file (user login/password)