From 07f88f19136ff64aa71d5eab87f4eead3c050d61 Mon Sep 17 00:00:00 2001 From: Abel Hoogeveen Date: Sun, 3 May 2015 18:12:58 +0200 Subject: [PATCH 1/2] Fixed a crucial bug which made it impossible to run continuous integration on FuzeWorks --- Core/System/class.config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/System/class.config.php b/Core/System/class.config.php index 4b810be..856c149 100644 --- a/Core/System/class.config.php +++ b/Core/System/class.config.php @@ -41,7 +41,7 @@ class Config extends Bus{ * @return StdObject of config */ public function loadConfigFile($name, $directory = null) { - $dir = (isset($directory) ? $directory : "Application/config/"); + $dir = (isset($directory) ? $directory : "Application/Config/"); $file = $dir . 'config.' . strtolower($name).".php"; if (file_exists($file)) { From a7204acd0cd57367c0d85be671ac385abb11bcf4 Mon Sep 17 00:00:00 2001 From: Abel Hoogeveen Date: Sun, 3 May 2015 18:23:29 +0200 Subject: [PATCH 2/2] Replaced zip command with git archive --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index ff77109..e72a768 100644 --- a/build.xml +++ b/build.xml @@ -27,8 +27,8 @@ - - + +