From 021b9c61b2fe1eb9a062bc01dcd93b6b8d693338 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Fri, 22 Jan 2016 13:48:12 +0100
Subject: [PATCH] Dev: full page bar close button referrer url

---
 application/core/Survey_Common_Action.php          | 5 +++++
 application/views/admin/super/fullpagebar_view.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
index b91bf03c58b..b86d8b0ee16 100644
--- a/application/core/Survey_Common_Action.php
+++ b/application/core/Survey_Common_Action.php
@@ -680,6 +680,11 @@ function _fullpagebar($aData)
     {
         if((isset($aData['fullpagebar'])))
         {
+            if(isset($aData['fullpagebar']['closebutton']['url']))
+            {
+                $sAlternativeUrl = $aData['fullpagebar']['closebutton']['url'];
+                $aData['fullpagebar']['closebutton']['url'] = Yii::app()->request->getUrlReferrer( Yii::app()->createUrl($sAlternativeUrl) );
+            }
             $this->getController()->renderPartial("/admin/super/fullpagebar_view", $aData);
         }
     }
diff --git a/application/views/admin/super/fullpagebar_view.php b/application/views/admin/super/fullpagebar_view.php
index 9aa4f7eaf1b..81186c9f79f 100644
--- a/application/views/admin/super/fullpagebar_view.php
+++ b/application/views/admin/super/fullpagebar_view.php
@@ -33,7 +33,7 @@
 
             <!-- Close -->
             <?php if(isset($fullpagebar['closebutton']['url'])):?>
-                <a class="btn btn-danger" href="<?php echo $this->createUrl($fullpagebar['closebutton']['url']); ?>" role="button">
+                <a class="btn btn-danger" href="<?php echo $fullpagebar['closebutton']['url']; ?>" role="button">
                     <span class="glyphicon glyphicon-close"></span>
                     <?php eT("Close");?>
                 </a>