Changeset 5172ac9 in github

Timestamp:

Sep 21, 2011 8:16:01 AM (20 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.7, release-0.8

Children:

5f71297

Parents:

7f03884

Message:

Aread alter forms in rcube_template::parse() instead of write()

File:

• program/include/rcube_template.php (modified) (2 diffs)

program/include/rcube_template.php

@@ -354 +354 @@
         $this->add_script($js, 'head_top');
 
-        // make sure all <form> tags have a valid request token
-        $template = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $template);
-        $this->footer = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $this->footer);
-        
         // send clickjacking protection headers
         $iframe = $this->framed || !empty($_REQUEST['_framed']);
@@ -437 +433 @@
 
         $output = $this->parse_with_globals($hook['content']);
+
+        // make sure all <form> tags have a valid request token
+        $output = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $output);
+        $this->footer = preg_replace_callback('/<form\s+([^>]+)>/Ui', array($this, 'alter_form_tag'), $this->footer);
 
         if ($write) {