Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -2,9 +2,10 @@
|
||||
/**
|
||||
* @brief [Front] Page Controller
|
||||
* @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
|
||||
* @subpackage Content
|
||||
* @since 25 Feb 2014
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
@@ -40,19 +41,6 @@ class _page extends \IPS\Dispatcher\Controller
|
||||
*/
|
||||
public function manage()
|
||||
{
|
||||
/* As we bypass the normal URL checks, we need to perform this here */
|
||||
if ( \IPS\Settings::i()->use_friendly_urls and ! empty( \IPS\Request::i()->url()->data['query'] ) and ( mb_stripos( \IPS\Request::i()->url()->data['query'], 'app=cms&module=pages&controller=page&path=' ) !== FALSE ) )
|
||||
{
|
||||
try
|
||||
{
|
||||
$url = \IPS\Request::i()->url();
|
||||
$url->makeFriendly( 'content_page_path', \IPS\Request::i()->url()->queryString['path'] );
|
||||
|
||||
\IPS\Output::i()->redirect( $url );
|
||||
}
|
||||
catch( \Exception $ex ) { }
|
||||
}
|
||||
|
||||
$this->view();
|
||||
}
|
||||
|
||||
@@ -113,7 +101,14 @@ class _page extends \IPS\Dispatcher\Controller
|
||||
{
|
||||
try
|
||||
{
|
||||
\IPS\Output::i()->redirect( \IPS\cms\Pages\Page::getUrlFromHistory( \IPS\Request::i()->path, ( isset( \IPS\Request::i()->url()->data['query'] ) ? \IPS\Request::i()->url()->data['query'] : NULL ) ), NULL, 301 );
|
||||
$page = \IPS\cms\Pages\Page::getUrlFromHistory( \IPS\Request::i()->path, ( isset( \IPS\Request::i()->url()->data['query'] ) ? \IPS\Request::i()->url()->data['query'] : NULL ) );
|
||||
|
||||
if( (string) $page == (string) \IPS\Request::i()->url() )
|
||||
{
|
||||
\IPS\Output::i()->error( 'content_err_page_404', '2T187/3', 404, '' );
|
||||
}
|
||||
|
||||
\IPS\Output::i()->redirect( $page, NULL, 301 );
|
||||
}
|
||||
catch( \OutOfRangeException $e )
|
||||
{
|
||||
@@ -159,9 +154,9 @@ class _page extends \IPS\Dispatcher\Controller
|
||||
public function __call( $method, $args )
|
||||
{
|
||||
$page = $this->getPage();
|
||||
|
||||
$page->setTheme();
|
||||
$databaseId = ( isset( \IPS\Request::i()->d ) ) ? \IPS\Request::i()->d : $page->getDatabase()->_id;
|
||||
|
||||
|
||||
if ( $databaseId !== NULL )
|
||||
{
|
||||
try
|
||||
|
||||
Reference in new issue
Block a user