sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.7.0

Browse Source
This commit is contained in:
Neo committed 2025-12-19 16:00:35 -08:00
1 parent 517a5e1f70
commit 8ba7d43898
1933 files changed
+65613 -11332
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/cms/sources/Blocks/Block.php
+5 -7
View File
@@ -354,7 +354,7 @@ EOF;
/**
* @brief Stores a \IPS\Widget object if this is a custom block with an embedded widget
*/
protected $widgetLoaded = NULL;
protected $widgetLoaded = [];
/**
* @brief Orientation for an embedded widget
@@ -601,8 +601,6 @@ EOF;
if ( $block_type === 'plugin' )
{
$form->addHtml( \IPS\Theme::i()->getTemplate( 'blocks', 'cms', 'admin' )->previewBlock() );
$templates = array( '_default_' => \IPS\Member::loggedIn()->language()->addToStack('content_block_template_use_default') );
foreach( \IPS\cms\Templates::getTemplates( \IPS\cms\Templates::RETURN_BLOCK ) as $id => $obj )
@@ -718,7 +716,7 @@ EOF;
\IPS\Output::i()->globalControllers[] = 'cms.admin.blocks.form';
\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'admin_blocks.js', 'cms' ) );
\IPS\Output::i()->title = ( $this->id ) ? \IPS\Member::loggedIn()->language()->addToStack('content_block_block_editing', NULL, array( 'sprintf' => array( $this->_title ) ) ) : \IPS\Member::loggedIn()->language()->addToStack('content_block_block_add');
\IPS\Output::i()->title = ( $this->id ) ? \IPS\Member::loggedIn()->language()->addToStack( 'content_block_block_editing', FALSE, array( 'sprintf' => array( $this->_title ) ) ) : \IPS\Member::loggedIn()->language()->addToStack('content_block_block_add');
}
/**
@@ -1028,12 +1026,12 @@ EOF;
$this->plugin = 'RecordFeed';
}
if ( ! $this->widgetLoaded )
if ( empty( $this->widgetLoaded[ $this->orientation ] ) )
{
$this->widgetLoaded = \IPS\Widget::load( $this->plugin_app ? \IPS\Application::load( $this->plugin_app ) : \IPS\Plugin::load( $this->plugin_plugin ), $this->plugin, mt_rand(), $this->_plugin_config, NULL, $this->orientation );
$this->widgetLoaded[ $this->orientation ]= \IPS\Widget::load( $this->plugin_app ? \IPS\Application::load( $this->plugin_app ) : \IPS\Plugin::load( $this->plugin_plugin ), $this->plugin, mt_rand(), $this->_plugin_config, NULL, $this->orientation );
}
return $this->widgetLoaded;
return $this->widgetLoaded[ $this->orientation ];
}
throw new \OutOfRangeException;