Version 4.5.0
This commit is contained in:
1 parent
1a0c7fd3c2
commit
f79dcf067a
3791 files changed
+248032
-76372
No files matched your search
@@ -12,7 +12,7 @@
|
||||
namespace IPS\cms\extensions\core\FrontNavigation;
|
||||
|
||||
/* 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;
|
||||
@@ -36,7 +36,7 @@ class _Pages extends \IPS\core\FrontNavigation\FrontNavigationAbstract
|
||||
/**
|
||||
* Allow multiple instances?
|
||||
*
|
||||
* @return string
|
||||
* @return bool
|
||||
*/
|
||||
public static function allowMultiple()
|
||||
{
|
||||
@@ -46,8 +46,8 @@ class _Pages extends \IPS\core\FrontNavigation\FrontNavigationAbstract
|
||||
/**
|
||||
* Get configuration fields
|
||||
*
|
||||
* @param array $configuration The existing configuration, if editing an existing item
|
||||
* @param int $id The ID number of the existing item, if editing
|
||||
* @param array $existingConfiguration The existing configuration, if editing an existing item
|
||||
* @param int $id The ID number of the existing item, if editing
|
||||
* @return array
|
||||
*/
|
||||
public static function configuration( $existingConfiguration, $id = NULL )
|
||||
@@ -69,6 +69,7 @@ class _Pages extends \IPS\core\FrontNavigation\FrontNavigationAbstract
|
||||
* Parse configuration fields
|
||||
*
|
||||
* @param array $configuration The values received from the form
|
||||
* @param int $id The ID number of the existing item, if editing
|
||||
* @return array
|
||||
*/
|
||||
public static function parseConfiguration( $configuration, $id )
|
||||
@@ -105,7 +106,7 @@ class _Pages extends \IPS\core\FrontNavigation\FrontNavigationAbstract
|
||||
}
|
||||
|
||||
/* Inherit from page */
|
||||
$store = \IPS\cms\Pages\Page::getPageUrlStore();
|
||||
$store = \IPS\cms\Pages\Page::getStore();
|
||||
|
||||
if ( isset( $store[ $this->configuration['menu_content_page'] ] ) )
|
||||
{
|
||||
@@ -133,7 +134,16 @@ class _Pages extends \IPS\core\FrontNavigation\FrontNavigationAbstract
|
||||
}
|
||||
else
|
||||
{
|
||||
return \IPS\Member::loggedIn()->language()->addToStack( "cms_page_{$this->configuration['menu_content_page']}" );
|
||||
$page = \IPS\cms\Pages\Page::load( $this->configuration['menu_content_page'] );
|
||||
|
||||
if( $database = $page->getDatabase() and $database->pageTitle() )
|
||||
{
|
||||
return $database->pageTitle();
|
||||
}
|
||||
else
|
||||
{
|
||||
return \IPS\Member::loggedIn()->language()->addToStack( "cms_page_{$this->configuration['menu_content_page']}" );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,7 +154,7 @@ class _Pages extends \IPS\core\FrontNavigation\FrontNavigationAbstract
|
||||
*/
|
||||
public function link()
|
||||
{
|
||||
$store = \IPS\cms\Pages\Page::getPageUrlStore();
|
||||
$store = \IPS\cms\Pages\Page::getStore();
|
||||
|
||||
if ( isset( $store[ $this->configuration['menu_content_page'] ] ) )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user