Index: trunk/core/kernel/db/db_event_handler.php =================================================================== diff -u -N -r8460 -r8472 --- trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 8460) +++ trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 8472) @@ -675,11 +675,13 @@ if (!$per_page) { // per-page is stored to persistent session $view_name = $this->Application->RecallVar($event->getPrefixSpecial().'_current_view'); - $per_page = $this->Application->RecallPersistentVar($event->getPrefixSpecial().'_PerPage.'.$view_name); + $storage_prefix = $event->getEventParam('same_special') ? $event->Prefix : $event->getPrefixSpecial(); + $per_page = $this->Application->RecallPersistentVar($storage_prefix.'_PerPage.'.$view_name); + if (!$per_page) { // per-page is stored to current session - $per_page = $this->Application->RecallVar($event->getPrefixSpecial().'_PerPage'); + $per_page = $this->Application->RecallVar($storage_prefix.'_PerPage'); } if (!$per_page) { @@ -712,12 +714,12 @@ $event->setPseudoClass('_List'); $object =& $event->getObject(); - $cur_sort1 = $this->Application->RecallVar($event->Prefix_Special.'_Sort1'); - $cur_sort1_dir = $this->Application->RecallVar($event->Prefix_Special.'_Sort1_Dir'); - $cur_sort2 = $this->Application->RecallVar($event->Prefix_Special.'_Sort2'); - $cur_sort2_dir = $this->Application->RecallVar($event->Prefix_Special.'_Sort2_Dir'); + $storage_prefix = $event->getEventParam('same_special') ? $event->Prefix : $event->Prefix_Special; + $cur_sort1 = $this->Application->RecallVar($storage_prefix.'_Sort1'); + $cur_sort1_dir = $this->Application->RecallVar($storage_prefix.'_Sort1_Dir'); + $cur_sort2 = $this->Application->RecallVar($storage_prefix.'_Sort2'); + $cur_sort2_dir = $this->Application->RecallVar($storage_prefix.'_Sort2_Dir'); - $sorting_configs = $this->Application->getUnitOption($event->Prefix, 'ConfigMapping'); $list_sortings = $this->Application->getUnitOption($event->Prefix, 'ListSortings'); $sorting_prefix = getArrayValue($list_sortings, $event->Special) ? $event->Special : '';