mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-06-26 03:30:48 +03:00
fix blocks
This commit is contained in:
parent
f7e3f0863b
commit
7867e4c5fc
|
@ -451,7 +451,16 @@ class ModuleViewer extends Module {
|
|||
$this->ClearBlocks($sGroup);
|
||||
}
|
||||
foreach ($aBlocks as $sBlock) {
|
||||
$this->AddBlock($sGroup,$sBlock);
|
||||
if (is_array($sBlock)) {
|
||||
$this->AddBlock(
|
||||
$sGroup,
|
||||
$sBlock['block'],
|
||||
isset($sBlock['params']) ? $sBlock['params'] : array(),
|
||||
isset($sBlock['priority']) ? $sBlock['priority'] : 5
|
||||
);
|
||||
} else {
|
||||
$this->AddBlock($sGroup,$sBlock);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -586,6 +595,14 @@ class ModuleViewer extends Module {
|
|||
*/
|
||||
foreach ($aRule['blocks'] as $sGroup => $aBlocks) {
|
||||
foreach ((array)$aBlocks as $sName=>$aParams) {
|
||||
/**
|
||||
* Если название блока указывается в параметрах
|
||||
*/
|
||||
if (is_int($sName)) {
|
||||
if (is_array($aParams)) {
|
||||
$sName=$aParams['block'];
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Если $aParams не являются массивом, значит передано только имя блока
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue