From 0277e44da2b57681ca3c99aeaf273456ef98d6f8 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 15 May 2014 23:05:27 +0200 Subject: [PATCH] Continued: - added 'base_path' to stack file name - updated 'core' - ignored all stack files Signed-off-by: Roland Haeder --- .gitignore | 1 + application/hub/main/source/class_BaseUrlSource.php | 3 ++- core | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f5c07af24..95266607c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ docs/html/* docs/latex/* docs/warn.log /nbproject +data/stacks/*.stack diff --git a/application/hub/main/source/class_BaseUrlSource.php b/application/hub/main/source/class_BaseUrlSource.php index 391346d32..be0ac63cc 100644 --- a/application/hub/main/source/class_BaseUrlSource.php +++ b/application/hub/main/source/class_BaseUrlSource.php @@ -42,7 +42,8 @@ class BaseUrlSource extends BaseSource { */ protected function initSource ($prefix, $sourceName) { // Construct file stack name - $stackFileName = sprintf('%s/%s.%s', + $stackFileName = sprintf('%s%s/%s.%s', + $this->getConfigInstance()->getConfigEntry('base_path'), $this->getConfigInstance()->getConfigEntry('base_file_stacks_path'), $sourceName, $this->getConfigInstance()->getConfigEntry('file_stacks_extension') diff --git a/core b/core index 74cc951d9..3f5eecf55 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 74cc951d93fe50a3285830bf757d985e0e670c58 +Subproject commit 3f5eecf55062fd4c24d483be590f38359eec5b76 -- 2.39.5