Add hook for request token creation (upon user request)

1 files changed, 3 insertions, 1 deletions

diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index f66b2904d..0a64d1cb1 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -69,7 +69,6 @@ class rcube_template extends rcube_html_page
 
         //$this->framed = $framed;
         $this->set_env('task', $task);
-        $this->set_env('request_token', $this->app->get_request_token());
 
         // load the correct skin (in case user-defined)
         $this->set_skin($this->config['skin']);
@@ -342,6 +341,9 @@ class rcube_template extends rcube_html_page
         else if ($unlock) {
             array_unshift($this->js_commands, array('hide_message', $unlock));
         }
+
+        $this->set_env('request_token', $this->app->get_request_token());
+
         // write all env variables to client
         $js = $this->framed ? "if(window.parent) {\n" : '';
         $js .= $this->get_js_commands() . ($this->framed ? ' }' : '');