Index: branches/5.1.x/core/kernel/db/db_tag_processor.php
===================================================================
diff -u -N -r13890 -r13932
--- branches/5.1.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 13890)
+++ branches/5.1.x/core/kernel/db/db_tag_processor.php	(.../db_tag_processor.php)	(revision 13932)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_tag_processor.php 13890 2010-08-29 09:34:52Z alex $
+* @version	$Id: db_tag_processor.php 13932 2010-09-12 10:12:42Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -257,37 +257,12 @@
 			$block_params['filter_field'] = isset($options['filter_field']) ? $options['filter_field'] : $field;
 
 			$w = $picker_helper->GetWidth($field);
-			if ($w) $options['width'] = $w;
 
-			/*if (isset($options['filter_width'])) {
-				$block_params['filter_width'] = $options['filter_width'];
+			if ($w) {
+				// column picker width overrides width from unit config
+				$block_params['width'] = $w;
 			}
-			elseif (isset($options['width'])) {
-				if (isset($options['filter_block']) && preg_match('/range/', $options['filter_block'])) {
-					if ($options['width'] < 60) {
-						$options['width'] = 60;
-						$block_params['filter_width'] = 20;
-					}
-					else {
-						$block_params['filter_width'] = $options['width'] - 40;
-					}
-				}
-				else {
-					$block_params['filter_width'] = max($options['width']-10, 20);
-				}
-			}*/
-			/*if (isset($block_params['filter_width'])) $block_params['filter_width'] .= 'px';
 
-
-			if (isset($options['filter_block']) && preg_match('/range/', $options['filter_block'])) {
-					$block_params['filter_width'] = '20px';
-			}
-			else {
-				$block_params['filter_width'] = '97%';
-//				$block_params['filter_width'] = max($options['width']-10, 20);
-			}*/
-
-
 			$field_options = $object->GetFieldOptions($field);
 			if (array_key_exists('use_phrases', $field_options)) {
 				$block_params['use_phrases'] = $field_options['use_phrases'];
@@ -297,6 +272,7 @@
 
 			$o.= $this->Application->ParseBlock($block_params, 1);
 		}
+
 		return $o;
 	}