Version 4.1.2

system/Data/Store/Database.php

@@ -55,16 +55,25 @@ class _Database extends \IPS\Data\Store
 	 * @return	void
 	 */
 	public function __construct()
-	{		
-		if ( \IPS\Session\Front::loggedIn() )
+	{
+		/* When caching is enabled, we only need cacheKeys, the rest will come from the cache */
+		if ( \IPS\CACHE_METHOD !== 'None' )
 		{
-			$this->initLoad[] = 'administrators';
-			$this->initLoad[] = 'moderators';
-			$this->initLoad[] = 'emoticons';
+			$this->initLoad = array( 'cacheKeys' );
 		}
+		/* Otherwise, we also need a few more things depending on whether the user is logged in or not */
 		else
 		{
-			$this->initLoad[] = 'loginHandlers';
+			if ( \IPS\Session\Front::loggedIn() )
+			{
+				$this->initLoad[] = 'administrators';
+				$this->initLoad[] = 'moderators';
+				$this->initLoad[] = 'emoticons';
+			}
+			else
+			{
+				$this->initLoad[] = 'loginHandlers';
+			}
 		}
 	}