Fixed issue #10522: Redirect loop between "add" and "edit" assessment

LimeSurvey · Mar 9, 2016 · df9e73a · df9e73a
1 parent f18dbca
commit df9e73a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -852,6 +852,7 @@ function _surveybar($aData)
             {
                 $sAlternativeUrl = $aData['surveybar']['closebutton']['url'];
                 $aForbiddenWordsInUrl = isset($aData['surveybar']['closebutton']['forbidden'])?$aData['surveybar']['closebutton']['forbidden']:array();
+                $aForbiddenWordsInUrl[]='assessmentedit';
                 $aData['surveybar']['closebutton']['url'] = Yii::app()->request->getUrlReferrer( Yii::app()->createUrl($sAlternativeUrl), $aForbiddenWordsInUrl );
             }
 

diff --git a/application/views/surveys/publicSurveyList.php b/application/views/surveys/publicSurveyList.php
@@ -1,5 +1,4 @@
 <?php
-
     $list = '<ul class="surveys-list">';
     foreach($publicSurveys as $survey)
     {
@@ -17,9 +16,9 @@
         $list .= CHtml::closeTag('li');
 
     }
+    $list .= "</ul>";
     if (!empty($futureSurveys))
     {
-        $list .= "</ul>";
         $list .= "<div class=\"survey-list-heading\">".  gT("Following survey(s) are not yet active but you can register for them.")."</div>";
         $list .= '<ul class="surveys-list future-surveys-list">';
         foreach($futureSurveys as $survey)