From 8849bd5fbc966e3f60963ccf2a08f40c13607e23 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 28 Apr 2010 16:52:28 +0000
Subject: [PATCH] bug 1484: after a "quick connect" you are correctly redirect
 to the same page.

git-svn-id: http://piwigo.org/svn/trunk@5986 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/block.class.php                            | 1 +
 themes/default/template/menubar_identification.tpl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/include/block.class.php b/include/block.class.php
index e8f091741..af84330bd 100644
--- a/include/block.class.php
+++ b/include/block.class.php
@@ -134,6 +134,7 @@ class BlockManager
     global $template;
 
     $template->set_filename('menubar', $file);
+    $template->assign(array('U_REDIRECT' => $_SERVER['REQUEST_URI']));
     trigger_action('blockmanager_apply', array(&$this) );
 
     foreach( $this->display_blocks as $id=>$block)
diff --git a/themes/default/template/menubar_identification.tpl b/themes/default/template/menubar_identification.tpl
index 703d6c87a..c0af6047d 100644
--- a/themes/default/template/menubar_identification.tpl
+++ b/themes/default/template/menubar_identification.tpl
@@ -28,6 +28,7 @@
 
 	{if isset($U_LOGIN)}
 	<form method="post" action="{$U_LOGIN}" id="quickconnect">
+        <input type="hidden" name="redirect" value="{$U_REDIRECT}">
 	<fieldset>
 	<legend>{'Quick connect'|@translate}</legend>
 	<div>