Merge pull request #42 from matchab/master

Timezone par défaut
This commit is contained in:
Sébastien SAUVAGE 2013-03-11 01:59:48 -07:00
commit 87e3d65023
2 changed files with 15 additions and 4 deletions

13
.gitignore vendored
View File

@ -1,5 +1,10 @@
# Ignore data/, tmp/, cache/ and pagecache/
data/
tmp/
cache/
pagecache/
data
tmp
cache
pagecache
# Eclipse project files
.settings
.buildpath
.project

View File

@ -4,6 +4,12 @@
// http://sebsauvage.net/wiki/doku.php?id=php:shaarli
// Licence: http://www.opensource.org/licenses/zlib-license.php
// Requires: php 5.1.x (but autocomplete fields will only work if you have php 5.2.x)
// -----------------------------------------------------------------------------------------------
// NEVER TRUST IN PHP.INI
// Some hosts do not define a default timezone in php.ini,
// so we have to do this for avoid the strict standard error.
date_default_timezone_set('UTC');
// -----------------------------------------------------------------------------------------------
// Hardcoded parameter (These parameters can be overwritten by creating the file /config/options.php)
$GLOBALS['config']['DATADIR'] = 'data'; // Data subdirectory