From: Roland Haeder <roland@mxchange.org>
Date: Thu, 14 May 2015 09:43:10 +0000 (+0200)
Subject: Renamed 'content' to 'main_content' + updated 'core'.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4109d26e0d3c6e858840169aba06c2828dbd0abf;p=shipsimu.git

Renamed 'content' to 'main_content' + updated 'core'.

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

diff --git a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
index e720850..54ddb05 100644
--- a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
+++ b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedStartupCommand.php
@@ -102,7 +102,7 @@ class WebGovernmentFailedStartupCommand extends BaseCommand implements Commandab
 
 		// Assign the main template with the master template as a content ... ;)
 		$templateInstance->compileTemplate();
-		$templateInstance->assignTemplateWithVariable('government_failed_main', 'content');
+		$templateInstance->assignTemplateWithVariable('government_failed_main', 'main_content');
 
 		// Load the master template
 		$templateInstance->loadCodeTemplate($masterTemplate);
diff --git a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
index fe8fc08..7119196 100644
--- a/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
+++ b/application/shipsimu/main/commands/web/government/class_WebGovernmentFailedTrainingCommand.php
@@ -102,7 +102,7 @@ class WebGovernmentFailedTrainingCommand extends BaseCommand implements Commanda
 
 		// Assign the main template with the master template as a content ... ;)
 		$templateInstance->compileTemplate();
-		$templateInstance->assignTemplateWithVariable('government_failed_main', 'content');
+		$templateInstance->assignTemplateWithVariable('government_failed_main', 'main_content');
 
 		// Load the master template
 		$templateInstance->loadCodeTemplate($masterTemplate);
diff --git a/application/shipsimu/templates/de/code/shipsimu_main.ctp b/application/shipsimu/templates/de/code/shipsimu_main.ctp
index 3dd1296..44cbb38 100644
--- a/application/shipsimu/templates/de/code/shipsimu_main.ctp
+++ b/application/shipsimu/templates/de/code/shipsimu_main.ctp
@@ -17,7 +17,7 @@
 </div>
 
 <div id="main_content">
-	{?content?}
+	{?main_content?}
 </div>
 
 <div id="main_footer">
diff --git a/core b/core
index f1483fb..a578894 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit f1483fbeae4881d349f9b9558340d1d56b0aab78
+Subproject commit a57889486c1cbc1a24f5926a02a80d319ed88a86