Dev: excluded expert statistics from close loop

LimeSurvey · Jan 22, 2016 · baf298f · baf298f
1 parent 5d2561b
commit baf298f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php
@@ -734,7 +734,7 @@ protected function _renderWrappedTemplate($sAction = 'export', $aViewUrls = arra
         //App()->getClientScript()->registerScriptFile( App()->getAssetManager()->publish( $switch) );
         App()->getClientScript()->registerScriptFile( $switch );
 
-        $aData['menu']['closeurl'] = Yii::app()->request->getUrlReferrer(Yii::app()->createUrl("/admin/survey/sa/view/surveyid/".$aData['surveyid']), array('simpleStatistics') );
+        $aData['menu']['closeurl'] = Yii::app()->request->getUrlReferrer(Yii::app()->createUrl("/admin/survey/sa/view/surveyid/".$aData['surveyid']), array('simpleStatistics', 'admin/statistics/sa/index') );
 
         $aData['display'] = array();
         $aData['display']['menu_bars'] = false;

diff --git a/application/core/LSHttpRequest.php b/application/core/LSHttpRequest.php
@@ -54,7 +54,6 @@ public function getUrlReferrer($sAlternativeUrl=null, $aForbiddenWordsInUrl=arra
        $referrer = parent::getUrlReferrer();
        $baseReferrer    = str_replace(Yii::app()->getBaseUrl(true), "", $referrer);
        $baseRequestUri  = str_replace(Yii::app()->getBaseUrl(), "", Yii::app()->request->requestUri);
-
        $referrer = ($baseReferrer != $baseRequestUri)?$referrer:null;
 
        // Checks if the alternative url should be used