]> git.mxchange.org Git - mailer.git/commitdiff
Updated 'core' + index.php
authorRoland Haeder <roland@mxchange.org>
Tue, 19 May 2015 11:41:16 +0000 (13:41 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 19 May 2015 11:41:16 +0000 (13:41 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
core
index.php

diff --git a/core b/core
index b84edaf9f45857dea7078c230cea0290089c0770..80d8dfb93ec212ef5073d8354f30397340b52b1a 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit b84edaf9f45857dea7078c230cea0290089c0770
+Subproject commit 80d8dfb93ec212ef5073d8354f30397340b52b1a
index 14bb9504466ff9aa914294db40a3d8c68f96a7d4..51eb50ef9341ef86cdff5c5f4a9b4023502e5024 100644 (file)
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @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()