Changeset 2066

Timestamp:

08/24/07 16:20:09 (17 months ago)

Author:

david

Message:

Added force_request_uri and force_request_url config options to FPF

Files:

• branches/0.11/src/filter/AgaviFormPopulationFilter.class.php (modified) (3 diffs)

branches/0.11/src/filter/AgaviFormPopulationFilter.class.php

@@ -114 +114 @@
     }
 
+    if($cfg['force_request_uri'] !== null) {
+      $ruri = $cfg['force_request_uri'];
+    } else {
+      $ruri = $req->getRequestUri();
+    }
+    if($cfg['force_request_url'] !== null) {
+      $rurl = $cfg['force_request_url'];
+    } else {
+      $rurl = $req->getUrl();
+    }
+    
     $luie = libxml_use_internal_errors(true);
     libxml_clear_errors();
@@ -233 +244 @@
       if($populate instanceof AgaviParameterHolder) {
         $action = preg_replace('/#.*$/', '', trim($form->getAttribute('action')));
-        $ruri = $req->getRequestUri();
-        $rurl = $req->getUrl();
         if(!(
           $action == $rurl ||
@@ -553 +562 @@
     $this->setParameter('force_output_mode', false);
     $this->setParameter('force_encoding', false);
+    $this->setParameter('force_request_uri', null);
+    $this->setParameter('force_request_url', null);
     $this->setParameter('parse_xhtml_as_xml', true);
     $this->setParameter('include_password_inputs', false);