Version 4.7.23
This commit is contained in:
1 parent
7124a02564
commit
25ddeb65d6
1791 files changed
+76990
-44452
No files matched your search
@@ -23,8 +23,6 @@ if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
*/
|
||||
class _Page extends \IPS\Node\Model implements \IPS\Node\Permissions
|
||||
{
|
||||
use \IPS\Content\ViewUpdates;
|
||||
|
||||
/**
|
||||
* @brief [ActiveRecord] Multiton Store
|
||||
*/
|
||||
@@ -448,7 +446,8 @@ class _Page extends \IPS\Node\Model implements \IPS\Node\Permissions
|
||||
/* Got a page called index? */
|
||||
if ( ! isset( static::$defaultPage[ $folderId ] ) )
|
||||
{
|
||||
foreach( static::getChildren( $folderId ) as $id => $obj )
|
||||
$children = static::getChildren( $folderId );
|
||||
foreach( $children as $id => $obj )
|
||||
{
|
||||
if ( \mb_substr( $obj->seo_name, 0, 5 ) === 'index' )
|
||||
{
|
||||
@@ -1445,7 +1444,7 @@ class _Page extends \IPS\Node\Model implements \IPS\Node\Permissions
|
||||
$return['edit_content'] = $buttons['edit_content'];
|
||||
}
|
||||
|
||||
if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'cms', 'pages', 'page_edit' ) )
|
||||
if ( \IPS\Member::loggedIn()->hasAcpRestriction( 'cms', 'pages', 'page_edit' ) and !$this->default )
|
||||
{
|
||||
$return['default'] = array(
|
||||
'icon' => $this->default ? 'star' : 'star-o',
|
||||
@@ -2360,10 +2359,20 @@ class _Page extends \IPS\Node\Model implements \IPS\Node\Permissions
|
||||
}
|
||||
|
||||
\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'pages/page.css', 'cms', 'front' ) );
|
||||
|
||||
if ( ! ( \IPS\Application::load('cms')->default AND ! $this->folder_id AND $this->default ) )
|
||||
try
|
||||
{
|
||||
\IPS\Output::i()->breadcrumb['module'] = array( $this->url(), $this->_title );
|
||||
$database = \IPS\cms\Databases\Dispatcher::i()->databaseId ? \IPS\cms\Databases::load( \IPS\cms\Databases\Dispatcher::i()->databaseId ) : null;
|
||||
if ( !$database or !$database->allow_club_categories )
|
||||
{
|
||||
throw new \OutOfRangeException;
|
||||
}
|
||||
}
|
||||
catch ( \OutOfRangeException|\OutOfBoundsException )
|
||||
{
|
||||
if ( !( \IPS\Application::load( 'cms' )->default and !$this->folder_id and $this->default ) )
|
||||
{
|
||||
\IPS\Output::i()->breadcrumb['module'] = array( $this->url(), $this->_title );
|
||||
}
|
||||
}
|
||||
|
||||
\IPS\Output::i()->pageName = $this->full_path;
|
||||
@@ -2660,7 +2669,7 @@ class _Page extends \IPS\Node\Model implements \IPS\Node\Permissions
|
||||
/**
|
||||
* Get item
|
||||
*
|
||||
* @return \IPS\nexus\Package\Item
|
||||
* @return \IPS\cms\Pages\PageItem
|
||||
*/
|
||||
public function item()
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user