From bc47068da60cbd8df89dc7d379bac5e93c48f6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= <sebastien@slucas.fr>
Date: Wed, 19 Mar 2014 20:12:55 +0100
Subject: [PATCH] Fix testing when config_local.php exists

---
 config.php          | 2 +-
 test/EpubFsTest.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config.php b/config.php
index 94df587..112e352 100644
--- a/config.php
+++ b/config.php
@@ -7,5 +7,5 @@
  */
 
     require_once 'config_default.php';
-    if (file_exists(dirname(__FILE__). '/config_local.php'))
+    if (file_exists(dirname(__FILE__). '/config_local.php') && (php_sapi_name() !== 'cli'))
         require_once 'config_local.php';
diff --git a/test/EpubFsTest.php b/test/EpubFsTest.php
index ef816bd..84a3759 100644
--- a/test/EpubFsTest.php
+++ b/test/EpubFsTest.php
@@ -6,9 +6,10 @@
  * @author     Sébastien Lucas <sebastien@slucas.fr>
  */
 
+require_once (dirname(__FILE__) . "/config_test.php");
 require_once (dirname(__FILE__) . "/../book.php");
 require_once (dirname(__FILE__) . "/../epubfs.php");
-require_once (dirname(__FILE__) . "/config_test.php");
+
 
 class EpubFsTest extends PHPUnit_Framework_TestCase
 {