From cf3784b780bc66f5ef9cfb5562ded9d1053ff2a0 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 7 Apr 2012 12:17:47 +0200
Subject: [PATCH] Fix incorrect filtering of custom blocks from drop-down list

---
 root/includes/acp/acp_portal.php | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/root/includes/acp/acp_portal.php b/root/includes/acp/acp_portal.php
index 66ba48e8..227d6624 100644
--- a/root/includes/acp/acp_portal.php
+++ b/root/includes/acp/acp_portal.php
@@ -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;
+									}
 								}
 							}