Fixed issue #18473: Survey listing - multiple call of SurveyGroup (#3787

)
LimeSurvey · Apr 16, 2024 · 16c8acb · 16c8acb
1 parent db9d752
commit 16c8acb
Showing 1 changed file with 21 additions and 9 deletions.
diff --git a/application/models/SurveysGroupsettings.php b/application/models/SurveysGroupsettings.php
@@ -74,12 +74,12 @@ class SurveysGroupsettings extends LSActiveRecord
     public $active;
     public $additional_languages;
 
+    /* self[] used in self::getInstance() */
+    private static $aSurveysGroupSettings = [];
 
     /**
      * @return string the associated database table name
      */
-
-
     public function tableName()
     {
         return '{{surveys_groupsettings}}';
@@ -112,6 +112,15 @@ public function rules()
         );
     }
 
+    /** @inheritdoc
+     * unset static aSurveysGroupSettings
+     **/
+    public function save($runValidation = true, $attributes = null)
+    {
+        unset(self::$aSurveysGroupSettings[$this->gsid]);
+        parent::save($runValidation, $attributes);
+    }
+
     /**
      * @return array relational rules.
      */
@@ -292,21 +301,24 @@ public function getIsAnonymized()
      * It steps up (see param $iStep) until it has found the real settings ...
      *
      * @param int $iSurveyGroupId
-     * @param null $oSurvey
-     * @param null $instance
+     * @param  \Survey|null $oSurvey
+     * @param \self|null $instance
      * @param int $iStep      this is inheritance step (recursive step) (parent, parentParent, parentParentParent ?)
      * @param bool $bRealValues
      * @return SurveysGroupsettings instance
      */
     public static function getInstance($iSurveyGroupId = 0, $oSurvey = null, $instance = null, $iStep = 1, $bRealValues = false)
     {
 
-        if ($iSurveyGroupId > 0) {
-            $model = SurveysGroupsettings::model()->with('SurveysGroups')->findByPk($iSurveyGroupId);
-        } else {
-            //this is the default group setting with gsid=0 !!!
-            $model = SurveysGroupsettings::model()->findByPk($iSurveyGroupId);
+        if (!array_key_exists($iSurveyGroupId, self::$aSurveysGroupSettings)) {
+            if ($iSurveyGroupId > 0) {
+                self::$aSurveysGroupSettings[$iSurveyGroupId] = SurveysGroupsettings::model()->with('SurveysGroups')->findByPk($iSurveyGroupId);
+            } else {
+                //this is the default group setting with gsid=0 !!!
+                self::$aSurveysGroupSettings[$iSurveyGroupId] = SurveysGroupsettings::model()->findByPk($iSurveyGroupId);
+            }
         }
+        $model = self::$aSurveysGroupSettings[$iSurveyGroupId];
 
         // set initial values to instance on first run
         if ($instance === null) {