From f86244baa4a3a2943c91344f966dac62a3fb6812 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Fri, 22 Jan 2016 13:35:16 +0100
Subject: [PATCH] Dev: label bar close button

---
 application/controllers/admin/labels.php             | 2 +-
 application/views/admin/labels/labelsetsbar_view.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/admin/labels.php b/application/controllers/admin/labels.php
index 24b6e0db218..35cd601cde7 100644
--- a/application/controllers/admin/labels.php
+++ b/application/controllers/admin/labels.php
@@ -209,7 +209,7 @@ public function index($sa, $lid=0)
         $aData['labelbar']['buttons']['edition']= TRUE;
         $aData['labelbar']['savebutton']['form'] = 'labelsetform';
         $aData['labelbar']['savebutton']['text'] = gT("Save");
-        $aData['labelbar']['closebutton']['url'] = 'admin/labels/sa/view';
+        $aData['labelbar']['closebutton']['url'] = Yii::app()->request->getUrlReferrer( Yii::app()->createUrl('admin/labels/sa/view') );
         $this->_renderWrappedTemplate('labels', $aViewUrls, $aData);
 
     }
diff --git a/application/views/admin/labels/labelsetsbar_view.php b/application/views/admin/labels/labelsetsbar_view.php
index 658971647ce..7a724730d2c 100644
--- a/application/views/admin/labels/labelsetsbar_view.php
+++ b/application/views/admin/labels/labelsetsbar_view.php
@@ -121,7 +121,7 @@
 
                     <?php echo $labelbar['savebutton']['text'];?>
                 </a>
-                <a class="btn btn-danger" href="<?php echo $this->createUrl($labelbar['closebutton']['url']); ?>" role="button">
+                <a class="btn btn-danger" href="<?php echo $labelbar['closebutton']['url']; ?>" role="button">
                     <span class="glyphicon glyphicon-close" ></span>
                     <?php eT("Close");?>
                 </a>