[Svn] r4672 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Wed Apr 20 10:48:29 CEST 2011


Author: thomasb
Date: 2011-04-20 03:48:29 -0500 (Wed, 20 Apr 2011)
New Revision: 4672

Modified:
   trunk/roundcubemail/program/include/rcube_template.php
Log:
Don't add env variable when template is empty (e.g. on error page)

Modified: trunk/roundcubemail/program/include/rcube_template.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_template.php	2011-04-20 08:47:44 UTC (rev 4671)
+++ trunk/roundcubemail/program/include/rcube_template.php	2011-04-20 08:48:29 UTC (rev 4672)
@@ -342,7 +342,8 @@
             array_unshift($this->js_commands, array('hide_message', $unlock));
         }
 
-        $this->set_env('request_token', $this->app->get_request_token());
+        if (!empty($this->script_files))
+          $this->set_env('request_token', $this->app->get_request_token());
 
         // write all env variables to client
         $js = $this->framed ? "if(window.parent) {\n" : '';

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list