Version 4.1.19

system/Content/ExtensionGenerator.php

@@ -2,9 +2,9 @@
 /**
  * @brief		Content Extension Generator
  * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - SVN_YYYY Invision Power Services, Inc.
+ * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
  * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Social Suite
+ * @package		IPS Community Suite
  * @since		26 Dec 2013
  * @version		SVN_VERSION_NUMBER
  */
@@ -27,6 +27,11 @@ abstract class _ExtensionGenerator
 	 * @brief	If TRUE, will prevent comment classes being included
 	 */
 	protected static $contentItemsOnly = FALSE;
+
+	/**
+	 * @brief	If TRUE, will include archive classes
+	 */
+	protected static $includeArchive = FALSE;
 	
 	/**
 	 * Generate Extensions
@@ -37,11 +42,21 @@ abstract class _ExtensionGenerator
 	{
 		$return = array();
 		
-		foreach ( \IPS\Content::routedClasses( FALSE, FALSE, static::$contentItemsOnly ) as $_class )
+		foreach ( \IPS\Content::routedClasses( FALSE, static::$includeArchive, static::$contentItemsOnly ) as $_class )
 		{
 			$obj = new static;
 			$obj->class = $_class;
-			\IPS\Member::loggedIn()->language()->words[ 'ipAddresses__core_Content_' . str_replace( '\\', '_', mb_substr( $_class, 4 ) ) ] = \IPS\Member::loggedIn()->language()->addToStack( $_class::$title . '_pl', FALSE );
+			
+			if ( \IPS\Dispatcher::hasInstance()  )
+			{
+				$language = \IPS\Member::loggedIn()->language();
+			}
+			else
+			{
+				$language = \IPS\Lang::load( \IPS\Lang::defaultLanguage() );
+			}
+
+			$language->words[ 'ipAddresses__core_Content_' . str_replace( '\\', '_', mb_substr( $_class, 4 ) ) ] = $language->addToStack( ( ( isset( $_class::$archiveTitle ) ) ? $_class::$archiveTitle : $_class::$title ) . '_pl', FALSE );
 			$return[ 'Content_' . str_replace( '\\', '_', mb_substr( $_class, 4 ) ) ] = $obj;
 		}