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 */ +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 {