Index: trunk/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r7702 -r7855 --- trunk/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7702) +++ trunk/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7855) @@ -105,7 +105,7 @@ $block_params['label'] = addslashes( $this->Application->Phrase($filter_params['label']) ); if (getArrayValue($view_filter,$filter_key)) { $submit = 0; - if ($params['old_style']) { + if (isset($params['old_style'])) { $status = $group_params['element_type'] == 'checkbox' ? 1 : 2; } else { @@ -151,13 +151,32 @@ $block_params['sort_field'] = isset($options['sort_field']) ? $options['sort_field'] : $field; $block_params['filter_field'] = isset($options['filter_field']) ? $options['filter_field'] : $field; + if (isset($options['filter_width'])) { + $block_params['filter_width'] = $options['filter_width']; + } + elseif (isset($options['width'])) { + if (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'; + $field_options = $this->Application->getUnitOption($this->Prefix.'.'.$field, 'Fields'); if (isset($field_options['use_phrases'])) { $block_params['use_phrases'] = $field_options['use_phrases']; } $block_params['is_last'] = ($i == count($grid_config)); - $block_params = array_merge($std_params, $block_params, $options); + $block_params = array_merge($std_params, $options, $block_params); $o.= $this->Application->ParseBlock($block_params, 1); } return $o; @@ -468,7 +487,9 @@ unset($params['page']); } - $params['pass'] = 'm,'.$this->getPrefixSpecial(); + if (!isset($params['pass'])) { + $params['pass'] = 'm,'.$this->getPrefixSpecial(); + } return $this->Application->HREF($t, '', $params); } @@ -1655,7 +1676,7 @@ $force_module = getArrayValue($params, 'module'); if ($force_module) { if ($force_module == '#session#') { - $force_module = $this->Application->RecallVar('module'); + $force_module = preg_replace('/([^:]*):.*/', '\1', $this->Application->RecallVar('module')); if (!$force_module) $force_module = 'core'; } else { @@ -1822,7 +1843,6 @@ //'UserFilesPath' => $pathtoroot.'kernel/user_files', 'ProjectPath' => BASE_PATH.'/', 'CustomConfigurationsPath' => $this->Application->BaseURL().'core/admin_templates/js/inp_fckconfig.js', -// 'EditorAreaCSS' => $this->Application->BaseURL().'/themes/inportal_site/inc/inportal.css', //GetThemeCSS(), 'StylesXmlPath' => $theme_path.'/inc/styles.xml', 'EditorAreaCSS' => $theme_path.'/inc/style.css', 'DefaultClass' => 'Default Text',