Changeset 2723

Timestamp:

05/31/2008 04:47:04 AM (4 months ago)

Author:

Geert

Message:

Follow-up to r2717

All pagination config groups now inherit and overwrite the default group. This allows you to only overwrite some settings in custom groups while keeping sitewide defaults.

Files:

• trunk/system/libraries/Pagination.php (modified) (3 diffs)

trunk/system/libraries/Pagination.php

@@ -18 +18 @@
         protected $uri_segment    = 3;
         protected $query_string   = '';
-        protected $items_per_page = 10;
+        protected $items_per_page = 20;
         protected $total_items    = 0;
         protected $auto_hide      = FALSE;
@@ -56 +56 @@
         public function __construct($group = NULL, $config = array())
         {
-                // No group name given, only array with custom config
+                // No group name given, only array with custom config items
                 // Allows for backward compatibility as well
                 if (is_array($group))
@@ -73 +73 @@
                         throw new Kohana_Exception('pagination.undefined_group', $group);
 
-                // Merge custom config items with group defaults
+                // All pagination config groups inherit default config group
+                if ($group !== 'default')
+                {
+                        // Load and validate default config group
+                        if ( ! is_array($default_config = Config::item('pagination.default')))
+                                throw new Kohana_Exception('pagination.undefined_group', 'default');
+
+                        // Merge config group with default config group
+                        $group_config += $default_config;
+                }
+
+                // Merge custom config items with config group
                 $config += $group_config;