From eab5b99600753f6bf4657a7c6177144830322532 Mon Sep 17 00:00:00 2001
From: Olle Haerstedt <olle.haerstedt@limesurvey.org>
Date: Wed, 19 Oct 2016 10:56:11 +0200
Subject: [PATCH] Fixed issue #11794: Show scenario number when edit condition

---
 application/controllers/admin/conditionsaction.php              | 2 +-
 .../admin/conditions/includes/form_editconditions_header.php    | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
index 0d7ea7a8809..ecb2ba78636 100644
--- a/application/controllers/admin/conditionsaction.php
+++ b/application/controllers/admin/conditionsaction.php
@@ -2140,6 +2140,6 @@ protected function redirectToConditionStart($qid, $gid)
      */
     protected function shouldShowScenario($subaction, $scenariocount)
     {
-        return (($subaction != "editthiscondition" && ($scenariocount == 1 || $scenariocount==0)) || ($subaction == "editthiscondition"));
+        return $subaction != "editthiscondition" && ($scenariocount == 1 || $scenariocount==0);
     }
 }
diff --git a/application/views/admin/conditions/includes/form_editconditions_header.php b/application/views/admin/conditions/includes/form_editconditions_header.php
index c9c02789104..49679bb415d 100644
--- a/application/views/admin/conditions/includes/form_editconditions_header.php
+++ b/application/views/admin/conditions/includes/form_editconditions_header.php
@@ -34,8 +34,6 @@
                         <span id='defaultscenariotxt'>
                             <?php eT("Default scenario"); ?>
                         </span>
-                    <?php endif;?>
-                    <?php if($showScenario):?>
                         &nbsp;
                         <button class='btn btn-default' id='scenarioaddbtn' onclick="scenarioaddbtnOnClickAction(); return false;" >
                             <span class='icon-add'></span>&nbsp;<?php eT('Add scenario'); ?>