From d12d8945af3a0fd7106c4a4c452f1ff737dbde18 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Thu, 2 Jun 2016 16:14:47 +0200
Subject: [PATCH] =?UTF-8?q?Fixed=20issue=20#11284:=20Unstyled=20error=20me?=
 =?UTF-8?q?ssage,=20when=20deleting=20Q1=20the=20message=20error=20appears?=
 =?UTF-8?q?=20because=20Q2=20needs=20Q1.=20That=E2=80=99s=20correct=20but?=
 =?UTF-8?q?=20as=20you've=20said=20it=20doesn=E2=80=99t=20look=20so=20nice?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/admin/questions.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
index 2871bf7d6ac..3a0367f073b 100644
--- a/application/controllers/admin/questions.php
+++ b/application/controllers/admin/questions.php
@@ -1424,11 +1424,8 @@ public function delete($surveyid, $gid, $qid)
                 if (isset($qidarray))
                     $qidlist = implode(", ", $qidarray);
                 $message =gT("Question could not be deleted. There are conditions for other questions that rely on this question. You cannot delete this question until those conditions are removed.");
-                $message .="<br /><a href='". $this->getController()->createUrl("admin/expressions/sa/survey_logic_file/sid/{$surveyid}")."' >".gT("Look at survey logic files")."</a>.";
-                $this->getController()->error(
-                    $message,
-                    $this->getController()->createUrl("admin/survey/sa/view/surveyid/{$surveyid}/gid/{$gid}/qid/{$qid}")
-                    );
+                 Yii::app()->setFlashMessage($message,'error');
+                 $this->getController()->redirect(array('admin/survey/sa/listquestions/surveyid/' . $surveyid ));
             }
             else
             {