Version 4.5.0

applications/cms/sources/Pages/PageItem.php

@@ -12,7 +12,7 @@
 namespace IPS\cms\Pages;
 
 /* 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;
@@ -90,23 +90,15 @@ class _PageItem extends \IPS\Content\Item implements \IPS\Content\Searchable
 	 *
 	 * @param	array		$indexData		Data from the search index
 	 * @param	array		$itemData		Basic data about the item. Only includes columns returned by item::basicDataColumns()
+	 * @param	string|NULL	$action			Action
 	 * @return	\IPS\Http\Url
 	 */
-	public static function urlFromIndexData( $indexData, $itemData )
+	public static function urlFromIndexData( $indexData, $itemData, $action = NULL )
 	{
-		if ( ( \IPS\Application::load('cms')->default OR \IPS\Settings::i()->cms_use_different_gateway ) AND $itemData['page_default'] AND !$itemData['page_folder_id'] )
+		if ( \IPS\Application::load('cms')->default AND $itemData['page_default'] AND !$itemData['page_folder_id'] )
 		{
-			/* Are we using the gateway file? */
-			if ( \IPS\Settings::i()->cms_use_different_gateway )
-			{
-				/* Yes, work out the proper URL. */
-				return \IPS\Http\Url::createFromString( \IPS\Settings::i()->cms_root_page_url, TRUE );
-			}
-			else
-			{
-				/* No - that's easy */
-				return \IPS\Http\Url::internal( '', 'front' );
-			}
+			/* No - that's easy */
+			return \IPS\Http\Url::internal( '', 'front' );
 		}
 		else
 		{
@@ -199,4 +191,15 @@ class _PageItem extends \IPS\Content\Item implements \IPS\Content\Searchable
 			return '';
 		}
 	}
+
+	/**
+	 * Should posting this increment the poster's post count?
+	 *
+	 * @param	\IPS\Node\Model|NULL	$container	Container
+	 * @return	void
+	 */
+	public static function incrementPostCount( \IPS\Node\Model $container = NULL )
+	{
+		return FALSE;
+	}
 }