Changeset 1419

Timestamp:

12/04/2007 08:17:52 PM (10 months ago)

Author:

Shadowhand

Message:

Changes to core:

• Pagination now includes the query string, to allow GET-driven searches with paged results
  
• ORM->delete(ALL) now respects where() calls
  
• Form_Model can now be constructed like this: $form = new Form_Model($title, $action, $inputs), to bypass chained method calls.
  

Location:

trunk/system

Files:

• libraries/ORM.php (modified) (2 diffs)
• libraries/Pagination.php (modified) (1 diff)
• models/form.php (modified) (3 diffs)

trunk/system/libraries/ORM.php

@@ -394 +394 @@
                                 $this->select = TRUE;
                         }
-                        elseif (preg_match('/like|regex/', $method))
+                        elseif (preg_match('/where|like|regex/', $method))
                         {
                                 $this->where = TRUE;
@@ -520 +520 @@
                 {
                         // WHERE for ALL: "WHERE 1" (h4x)
-                        $where = TRUE;
+                        $where = ($this->where === TRUE) ? NULL : TRUE;
                 }
                 else

trunk/system/libraries/Pagination.php

@@ -93 +93 @@
                         }
 
-                        // Create a generic base_url with {page} placeholder
+                        // Create a generic base_url with {page} and {query_string} placeholders
                         $this->base_url[$this->uri_segment - 1] = '{page}';
-                        $this->base_url = url::site(implode('/', $this->base_url));
+                        $this->base_url = url::site(implode('/', $this->base_url)).Router::$query_string;
                 }
 

trunk/system/models/form.php

@@ -7 +7 @@
 
         // Title attribute
-        protected $title  = '';
+        protected $title = '';
 
         // Input data
@@ -18 +18 @@
         protected $status;
 
-        public function __construct()
+        public function __construct($title = NULL, $action = NULL, $inputs = NULL)
         {
                 // Uncomment the following line if you want the database loaded:
@@ -25 +25 @@
                 // Load validation
                 $this->validation = new Validation();
+
+                // Set title
+                is_null($title) or $this->title($title);
+
+                // Set action
+                is_null($action) or $this->action($action);
+
+                // Set inputs
+                is_array($inputs) and $this->inputs($inputs);
         }