Version 4.5.0

system/Data/Store/Database.php

@@ -11,7 +11,7 @@
 namespace IPS\Data\Store;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -63,15 +63,19 @@ class _Database extends \IPS\Data\Store
 		/* Otherwise, we also need a few more things depending on whether the user is logged in or not */
 		else
 		{
+			$this->initLoad[] = 'announcements';
+			$this->initLoad[] = 'loginMethods'; # Previously, this was only loaded for Guests, however both Guests and Logged In members interface with login handlers (ex. profile syncing).
+			$this->initLoad[] = 'widgets';
+			$this->initLoad[] = 'defaultStreamData';
+			$this->initLoad[] = 'acpNotifications';
+			$this->initLoad[] = 'emoticons';
+
 			if ( \IPS\Session\Front::loggedIn() )
 			{
 				$this->initLoad[] = 'administrators';
 				$this->initLoad[] = 'moderators';
-				$this->initLoad[] = 'emoticons';
-			}
-			else
-			{
-				$this->initLoad[] = 'loginHandlers';
+				$this->initLoad[] = 'group_promotions';
+				$this->initLoad[] = 'promoters';
 			}
 		}
 	}
@@ -99,7 +103,7 @@ class _Database extends \IPS\Data\Store
 	 */
 	public function get( $key )
 	{
-		if ( !$this->doneInitLoad and in_array( $key, $this->initLoad ) )
+		if ( !$this->doneInitLoad and \in_array( $key, $this->initLoad ) )
 		{
 			$this->loadIntoMemory( $this->initLoad );
 			$this->doneInitLoad = TRUE;
@@ -185,6 +189,7 @@ class _Database extends \IPS\Data\Store
 	/**
 	 * Abstract Method: Clear All Caches
 	 *
+	 * @param	NULL|string	$exclude	Key to exclude (keep)
 	 * @return	void
 	 */
 	public function clearAll( $exclude=NULL )