From: Roland Häder <roland@mxchange.org>
Date: Tue, 3 Jul 2018 22:40:27 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ab5f44d1a881bde316a34c6edca6907380ccf88b;p=hub.git

Continued:
- renamed $app -> $applicationInstance
- assignApplicationData() has no parameters now
- updated core to latest commit

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
index 0da9ba6fe..c33eeb7e7 100644
--- a/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
+++ b/application/hub/classes/apt-proxy/console/class_NodeConsoleAptProxy.php
@@ -72,11 +72,11 @@ class NodeConsoleAptProxy extends BaseNodeAptProxy implements AptProxy, Register
 	 */
 	public function outputConsoleTeaser () {
 		// Get the app instance (for shortening our code)
-		$app = $this->getApplicationInstance();
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
 		// Output all lines
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
-		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - An apt-proxy connection helper');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - An apt-proxy connection helper');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2012 Apt-Proxy Developer Team');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
diff --git a/application/hub/classes/chat/console/class_NodeConsoleChat.php b/application/hub/classes/chat/console/class_NodeConsoleChat.php
index 1fa9b9a91..da1fc45f8 100644
--- a/application/hub/classes/chat/console/class_NodeConsoleChat.php
+++ b/application/hub/classes/chat/console/class_NodeConsoleChat.php
@@ -72,11 +72,11 @@ class NodeConsoleChat extends BaseNodeChat implements Chatter, Registerable {
 	 */
 	public function outputConsoleTeaser () {
 		// Get the app instance (for shortening our code)
-		$app = $this->getApplicationInstance();
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
 		// Output all lines
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
-		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - A telnet connection helper');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - A telnet connection helper');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2012 Chat Developer Team');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
diff --git a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
index de8c4845b..ac5d35984 100644
--- a/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
+++ b/application/hub/classes/crawler/console/class_NodeConsoleCrawler.php
@@ -72,11 +72,11 @@ class NodeConsoleCrawler extends BaseNodeCrawler implements Crawler, Registerabl
 	 */
 	public function outputConsoleTeaser () {
 		// Get the app instance (for shortening our code)
-		$app = $this->getApplicationInstance();
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
 		// Output all lines
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
-		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Distributed Crawler v' . $app->getAppVersion());
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Distributed Crawler v' . $applicationInstance->getAppVersion());
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2014 Crawler Developer Team');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
diff --git a/application/hub/classes/nodes/class_BaseHubNode.php b/application/hub/classes/nodes/class_BaseHubNode.php
index 7757175a0..c9808caea 100644
--- a/application/hub/classes/nodes/class_BaseHubNode.php
+++ b/application/hub/classes/nodes/class_BaseHubNode.php
@@ -272,11 +272,11 @@ abstract class BaseHubNode extends BaseHubSystem implements Updateable, AddableC
 	 */
 	public function outputConsoleTeaser () {
 		// Get the app instance (for shortening our code)
-		$app = $this->getApplicationInstance();
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
 
 		// Output all lines
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
-		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($app->getAppName() . ' v' . $app->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' mode active');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' mode active');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('Copyright (c) 2007 - 2008 Roland Haeder, 2009 - 2015 Hub Developer Team');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(' ');
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.');
diff --git a/core b/core
index 2f930fd62..3509acc25 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 2f930fd62f97e06a6b90afb971cce6343522f9b9
+Subproject commit 3509acc2599a67101b078129441c8125f93dfa1e
diff --git a/index.php b/index.php
index 1e7f1d48f..e3c5da87d 100644
--- a/index.php
+++ b/index.php
@@ -137,7 +137,7 @@ final class ApplicationEntryPoint {
 				$applicationInstance = ApplicationHelper::getSelfInstance();
 
 				// Assign application data
-				$templateInstance->assignApplicationData($applicationInstance);
+				$templateInstance->assignApplicationData();
 			} // END - if
 
 			// We only try this