From 6f23b64e5ae259125febff8907fa7537a86ada9c Mon Sep 17 00:00:00 2001
From: Olle Haerstedt <olle.haerstedt@limesurvey.org>
Date: Fri, 22 Apr 2016 12:35:29 +0200
Subject: [PATCH] Fixed issue #11011: Blank screen after adding new group

---
 application/controllers/admin/questiongroups.php | 5 +++++
 application/core/Survey_Common_Action.php        | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/application/controllers/admin/questiongroups.php b/application/controllers/admin/questiongroups.php
index 974c56d2515..dc553871a00 100644
--- a/application/controllers/admin/questiongroups.php
+++ b/application/controllers/admin/questiongroups.php
@@ -300,6 +300,11 @@ public function insert($surveyid)
             {
                 $this->getController()->redirect(array('admin/questiongroups/sa/view/surveyid/' . $surveyid . '/gid/' . $gid));
             }
+            else
+            {
+                // After save, go to edit
+                $this->getController()->redirect(array("admin/questiongroups/sa/edit/surveyid/$surveyid/gid/$gid"));
+            }
         }
         else
         {
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
index 88b0563a786..c4503438997 100644
--- a/application/core/Survey_Common_Action.php
+++ b/application/core/Survey_Common_Action.php
@@ -687,7 +687,10 @@ function _nquestiongroupbar($aData)
             if(isset($aData['questiongroupbar']['closebutton']['url']))
             {
                 $sAlternativeUrl = $aData['questiongroupbar']['closebutton']['url'];
-                $aData['questiongroupbar']['closebutton']['url'] = Yii::app()->request->getUrlReferrer( Yii::app()->createUrl($sAlternativeUrl) );
+                $aForbiddenWordsInUrl = array(
+                    'add'
+                );
+                $aData['questiongroupbar']['closebutton']['url'] = Yii::app()->request->getUrlReferrer(Yii::app()->createUrl($sAlternativeUrl), $aForbiddenWordsInUrl);
             }
 
             $this->getController()->renderPartial("/admin/survey/QuestionGroups/questiongroupbar_view", $aData);
@@ -860,6 +863,7 @@ function _surveybar($aData)
                 $aForbiddenWordsInUrl[]='assessmentedit';
                 $aForbiddenWordsInUrl[]='setsurveysecurity';
                 $aForbiddenWordsInUrl[]='importsurveyresources';
+                $aForbiddenWordsInUrl[]='add';
                 $aData['surveybar']['closebutton']['url'] = Yii::app()->request->getUrlReferrer( Yii::app()->createUrl($sAlternativeUrl), $aForbiddenWordsInUrl );
             }