Index: trunk/core/units/categories/categories_config.php
===================================================================
diff -u -r3145 -r3613
--- trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 3145)
+++ trunk/core/units/categories/categories_config.php (.../categories_config.php) (revision 3613)
@@ -98,6 +98,7 @@
),
),
'ConfigMapping' => Array(
+ 'PerPage' => 'Perpage_Category',
'DefaultSorting1Field' => 'Category_Sortfield',
'DefaultSorting2Field' => 'Category_Sortfield2',
'DefaultSorting1Dir' => 'Category_Sortorder',
Index: trunk/core/kernel/db/db_event_handler.php
===================================================================
diff -u -r3597 -r3613
--- trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 3597)
+++ trunk/core/kernel/db/db_event_handler.php (.../db_event_handler.php) (revision 3613)
@@ -464,8 +464,11 @@
if(!$per_page)
{
- if ( $config_mapping ) {
- $per_page = $this->Application->ConfigValue($config_mapping['PerPage']);
+ if ($config_mapping) {
+ if (!isset($config_mapping['PerPage'])) {
+ trigger_error('Incorrect mapping of PerPage key in config for prefix '.$event->Prefix.'', E_USER_WARNING);
+ }
+ $per_page = $this->Application->ConfigValue($config_mapping['PerPage']);
}
if(!$per_page) $per_page = 10;
}
Index: trunk/kernel/units/categories/categories_config.php
===================================================================
diff -u -r3145 -r3613
--- trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 3145)
+++ trunk/kernel/units/categories/categories_config.php (.../categories_config.php) (revision 3613)
@@ -98,6 +98,7 @@
),
),
'ConfigMapping' => Array(
+ 'PerPage' => 'Perpage_Category',
'DefaultSorting1Field' => 'Category_Sortfield',
'DefaultSorting2Field' => 'Category_Sortfield2',
'DefaultSorting1Dir' => 'Category_Sortorder',
Index: trunk/kernel/admin_templates/category_selector.tpl
===================================================================
diff -u -r3114 -r3613
--- trunk/kernel/admin_templates/category_selector.tpl (.../category_selector.tpl) (revision 3114)
+++ trunk/kernel/admin_templates/category_selector.tpl (.../category_selector.tpl) (revision 3613)
@@ -3,7 +3,7 @@
-
+
@@ -86,11 +86,20 @@