Application selector (demo app!) fixed

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index fffdd3d20fb4f3707e5cd3d746ab55c2c04cf0f2..9a8357da5075c8ea0e29bd94b3b5f7bda20d46b0 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -46,7 +46,7 @@ class ApplicationSelector extends BaseFrameworkSystem {
        private $dirIgnoreList = array(
                ".",
                "..",
-               ".htaccess"
+               ".htaccess",
                ".svn"
        );
 

diff --git a/application/selector/init.php b/application/selector/init.php
index ed31055300d03a539260f0a8b13dc75616429a5d..faba5c4c78fc710ed9422a495d41a3c0c86b7e89 100644 (file)
--- a/application/selector/init.php
+++ b/application/selector/init.php
@@ -25,6 +25,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+// Initialize output system
+require(PATH . 'inc/output.php');
+
+// Initialize file i/o system
+require(PATH . 'inc/file_io.php');
+
+// Include the language sub-system
+require(PATH . 'inc/language.php');
+
 // Generate call-back function
 $callback = sprintf("%s::getInstance",
        FrameworkConfiguration::getInstance()->readConfig('app_helper_class')
@@ -38,14 +47,9 @@ $app->setAppName("Applikationsausw&auml;hler");
 $app->setAppVersion("0.1a");
 $app->setAppShortName(FrameworkConfiguration::getInstance()->readConfig('selector_name'));
 
-// Initialize output system
-require(PATH . 'inc/output.php');
-
-// Initialize file i/o system
-require(PATH . 'inc/file_io.php');
-
-// Include the language sub-system
-require(PATH . 'inc/language.php');
+// Set instances
+$app->setFileIoInstance($io);
+$app->setLanguageInstance($lang);
 
 // [EOF]
 ?>