Version 4.2.0

applications/cms/sources/Databases/Dispatcher.php

@@ -1,13 +1,12 @@
 <?php
 /**
  * @brief		Database Dispatcher
- * @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		16 April 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\cms\Databases;
@@ -166,7 +165,13 @@ class _Dispatcher extends \IPS\Dispatcher
 		}
 
 		$path = trim(  preg_replace( '#' . \IPS\cms\Pages\Page::$currentPage->full_path . '#', '', \IPS\Request::i()->path, 1 ), '/' );
-		
+
+		/* If we visited the default page in a folder, the full_path will be like folder/page but the request path will just be folder */
+		if( \IPS\Request::i()->path . '/' . \IPS\cms\Pages\Page::$currentPage->seo_name == \IPS\cms\Pages\Page::$currentPage->full_path )
+		{
+			$path = '';
+		}
+
 		$this->databaseId = $database->id;
 
 		if ( ! $database->use_categories )
@@ -207,7 +212,8 @@ class _Dispatcher extends \IPS\Dispatcher
 					try
 					{
 						$record = $recordClass::loadFromSlug( $slug );
-						\IPS\Output::i()->redirect( $record->url(), NULL, 301 );
+						
+						$this->_redirectToCorrectUrl( $record->url() );
 					}
 					catch ( \OutOfRangeException $ex )
 					{