Index: branches/RC/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r10357 -r10372
--- branches/RC/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 10357)
+++ branches/RC/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 10372)
@@ -440,7 +440,17 @@
Grids[''].InitItems();
- setTimeout('window.location.reload();', * 60000);
+ function refresh_grid() {
+ // window.location.reload();
+ var $window_url = window.location.href;
+ if ($window_url.indexOf('skip_session_refresh=1') == -1) {
+ $window_url += '&skip_session_refresh=1';
+ }
+
+ window.location.href = $window_url;
+ }
+
+ setTimeout('refresh_grid()', * 60000);
Index: branches/RC/core/kernel/session/session.php
===================================================================
diff -u -r10294 -r10372
--- branches/RC/core/kernel/session/session.php (.../session.php) (revision 10294)
+++ branches/RC/core/kernel/session/session.php (.../session.php) (revision 10372)
@@ -779,7 +779,14 @@
*/
function Refresh()
{
- if ($this->CookiesEnabled) $this->SetSessionCookie(); //we need to refresh the cookie
+ if ($this->Application->GetVar('skip_session_refresh')) {
+ return ;
+ }
+
+ if ($this->CookiesEnabled) {
+ // we need to refresh the cookie
+ $this->SetSessionCookie();
+ }
$this->Storage->UpdateSession($this);
}