From ccc895bc0933e92cc4442f2e2849fecf0b439188 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Fri, 28 Sep 2012 20:53:01 +0200
Subject: [PATCH] Fix travis build

---
 .travis.yml         | 2 --
 tests/bootstrap.inc | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b226901b2..a565d91733 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@ before_script:
   - mysql -e "source `pwd`/hudson/fixtures.sql"
   - mysql -e 'SET GLOBAL time_zone = "+02:00";'
   - mysql -e 'SET @@global.sql_mode= "";'
-  - echo "date.timezone = Europe/Berlin" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
   - git clone git://github.com/alchemy-fr/Phraseanet-Extension.git
   - sh -c "cd Phraseanet-Extension && ./configure && make && sudo make install"
   - echo "extension=phrasea2.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
@@ -25,7 +24,6 @@ before_script:
   - tar -xzf gmagick-1.1.0RC2.tgz
   - sh -c "cd gmagick-1.1.0RC2 && phpize && ./configure --with-gmagick=/usr/local && make && sudo make install"
   - echo "extension=gmagick.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
-  - php -r "var_dump(ini_get('date.timezone'));"
 
 notifications:
   irc:
diff --git a/tests/bootstrap.inc b/tests/bootstrap.inc
index 62fbbf85e5..038a38d684 100644
--- a/tests/bootstrap.inc
+++ b/tests/bootstrap.inc
@@ -1,3 +1,4 @@
 <?php
 
+ini_set('date.timezone', 'Europe/Paris');
 require dirname(__FILE__) . '/../lib/bootstrap.php';