Changeset 804:f10e7e0dffe0 for inc/admin/class.dc.filter.php

Timestamp:

03/16/12 09:13:56 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

Tuned formfilters. Added sortby and order to filter form

File:

• inc/admin/class.dc.filter.php (modified) (2 diffs)

inc/admin/class.dc.filter.php

@@ -236 +236 @@
                          if ($this->eextra != null) {
                               $this->eextra->save();
-                              $this->eextra->updateRequestParams($data);
                          }
                          http::redirect($this->action.'?'.http_build_query($data,'','&'));
@@ -260 +259 @@
                }
                if ($load_from_settings) {
-                    $get = new ArrayObject($this->loadFilters());
-                    if ($this->eextra != null) {
-                         $this->eextra->load();
-                         $this->eextra->updateRequestParams($get);
-                    }
+                    $get = new ArrayObject(array_merge($this->loadFilters(),$get));
                }
                $this->initializeFromData($this->efilters, $this->eextra, $get);
                $this->initializeFromData($this->lfilters, $this->lextra, $get);
+
           }
      }