Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63 from marc1706/master

Browse Source 
Fix incorrect filtering of custom blocks from drop-down list
This commit is contained in:
Marc Alexander
2012-04-07 03:24:18 -07:00
parent 01755ad5b5 cf3784b780
commit 908db8fa6c
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
root/includes/acp/acp_portal.php
View File

@@ -857,24 +857,27 @@ class acp_portal
}
// do we want to add the module to the side columns or to the center columns?
if (in_array($column_string, array('left', 'right')))
if ($module_class != 'custom')
{
// does the module already exist in the side columns?
if (isset($module_column[$module_class]) &&
(in_array('left', $module_column[$module_class]) || in_array('right', $module_column[$module_class])))
if (in_array($column_string, array('left', 'right')))
{
continue;
// does the module already exist in the side columns?
if (isset($module_column[$module_class]) &&
(in_array('left', $module_column[$module_class]) || in_array('right', $module_column[$module_class])))
{
continue;
}
}
}
elseif (in_array($column_string, array('center', 'top', 'bottom')))
{
// does the module already exist in the center columns?
if (isset($module_column[$module_class]) &&
(in_array('center', $module_column[$module_class]) ||
in_array('top', $module_column[$module_class]) ||
in_array('bottom', $module_column[$module_class])))
elseif (in_array($column_string, array('center', 'top', 'bottom')))
{
continue;
// does the module already exist in the center columns?
if (isset($module_column[$module_class]) &&
(in_array('center', $module_column[$module_class]) ||
in_array('top', $module_column[$module_class]) ||
in_array('bottom', $module_column[$module_class])))
{
continue;
}
}
}