Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r11682 -r11711
--- branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 11682)
+++ branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 11711)
@@ -734,7 +734,7 @@
 				$view_name = $this->Application->RecallVar($event->getPrefixSpecial().'_current_view');
 
 				$storage_prefix = $event->getEventParam('same_special') ? $event->Prefix : $event->getPrefixSpecial();
-				$per_page = $this->Application->RecallPersistentVar($storage_prefix.'_PerPage.'.$view_name, '_USE_DEFAULT_USER_DATA_');
+				$per_page = $this->Application->RecallPersistentVar($storage_prefix.'_PerPage.'.$view_name, ALLOW_DEFAULT_SETTINGS);
 
 				if (!$per_page) {
 					// per-page is stored to current session
@@ -2110,6 +2110,8 @@
 			if ($event->Special == 'export' || $event->Special == 'import')
 			{
 				$export_helper =& $this->Application->recallObject('CatItemExportHelper');
+				/* @var $export_helper kCatDBItemExportHelper */
+
 				$export_helper->prepareExportColumns($event);
 			}
 		}