From 946c39bea40b49b0ac79700692e78fa6cee327d2 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 19 May 2015 13:41:16 +0200 Subject: [PATCH] Updated 'core' + index.php MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- core | 2 +- index.php | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core b/core index b84edaf9f4..80d8dfb93e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit b84edaf9f45857dea7078c230cea0290089c0770 +Subproject commit 80d8dfb93ec212ef5073d8354f30397340b52b1a diff --git a/index.php b/index.php index 14bb950446..51eb50ef93 100644 --- a/index.php +++ b/index.php @@ -9,7 +9,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -55,7 +55,7 @@ final class ApplicationEntryPoint { // Is a message set? if (empty($message)) { // No message provided - $message = 'No message provided!'; + $message = 'No message provided.'; } // END - if // Get config instance @@ -68,7 +68,7 @@ final class ApplicationEntryPoint { } // END - if // Get some instances - $tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('web_template_class'); + $tpl = FrameworkConfiguration::getSelfInstance()->getConfigEntry('html_template_class'); $languageInstance = LanguageSystem::getSelfInstance(); // Initialize template instance here to avoid warnings in IDE @@ -197,9 +197,6 @@ final class ApplicationEntryPoint { // Load all include files require($cfg->getConfigEntry('base_path') . 'inc/includes.php'); - // Load all framework classes - require($cfg->getConfigEntry('base_path') . 'inc/classes.php'); - // Include the application selector require($cfg->getConfigEntry('base_path') . 'inc/selector.php'); } // END - main() -- 2.30.2