Version 4.2.0

applications/cms/modules/front/pages/page.php

@@ -1,13 +1,12 @@
 <?php
 /**
  * @brief		[Front] Page Controller
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @subpackage	Content
  * @since		25 Feb 2014
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\cms\modules\front\pages;
@@ -68,8 +67,16 @@ class _page extends \IPS\Dispatcher\Controller
 			$permissions = $page->permissions();
 			\IPS\Session::i()->setLocation( $page->url(), explode( ",", $permissions['perm_view'] ), 'loc_cms_viewing_page', array( 'cms_page_' . $page->_id => TRUE ) );
 		}
-
-		$page->output();
+		
+		try
+		{
+			$page->output();
+		}
+		catch ( \ParseError $e )
+		{
+			\IPS\Log::log( $e, 'page_error' );
+			\IPS\Output::i()->error( 'content_err_page_500', '2T187/4', 500, 'content_err_page_500_admin', array(), $e );
+		}
 	}
 	
 	/**
@@ -161,7 +168,14 @@ class _page extends \IPS\Dispatcher\Controller
 		{
 			try
 			{
-				return \IPS\cms\Databases\Dispatcher::i()->setDatabase( $databaseId )->run();
+				if ( \IPS\Request::i()->isAjax() )
+				{
+					return \IPS\cms\Databases\Dispatcher::i()->setDatabase( $databaseId )->run();
+				}
+				else
+				{
+					$page->output();
+				}
 			}
 			catch( \OutOfRangeException $e )
 			{