Index: branches/RC/core/kernel/db/db_event_handler.php =================================================================== diff -u -N -r11653 -r11662 --- branches/RC/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 11653) +++ branches/RC/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 11662) @@ -905,7 +905,7 @@ $cur_sort1 = $this->Application->RecallVar($event->Prefix_Special.'_Sort1'); $cur_sort1_dir = $this->Application->RecallVar($event->Prefix_Special.'_Sort1_Dir'); - $use_double_sorting = $this->Application->ConfigValue('UseDoubleSorting') !== false ? $this->Application->ConfigValue('UseDoubleSorting') : true; + $use_double_sorting = $this->Application->ConfigValue('UseDoubleSorting'); if ($use_double_sorting) { $cur_sort2 = $this->Application->RecallVar($event->Prefix_Special.'_Sort2'); @@ -1862,33 +1862,8 @@ function finalizePopup(&$event) { $event->SetRedirectParam('opener', 'u'); - - - - /*return ; - - // 2. substitute opener - $opener_stack = $this->Application->RecallVar('opener_stack'); - $opener_stack = $opener_stack ? unserialize($opener_stack) : Array(); - //array_pop($opener_stack); - - $t = $this->Application->RecallVar('return_template'); - $this->Application->RemoveVar('return_template'); - - // restore original "m" prefix all params, that have values before opening selector - $return_m = $this->Application->RecallVar('return_m'); - $this->Application->RemoveVar('return_m'); - $this->Application->HttpQuery->parseEnvPart($return_m); - - $pass_events = $event->getEventParam('pass_events'); - $redirect_params = array_merge_recursive2($event->redirect_params, Array('m_opener' => 'u', '__URLENCODE__' => 1)); - - $new_level = 'index.php|'.ltrim($this->Application->BuildEnv($t, $redirect_params, 'all', $pass_events), ENV_VAR_NAME.'='); - array_push($opener_stack, $new_level); - $this->Application->StoreVar('opener_stack', serialize($opener_stack));*/ } - /** * Create search filters based on search query *