Dev: Generalize setGlobalOption()

LimeSurvey · Jun 21, 2018 · e68dd23 · e68dd23
1 parent 7649790
commit e68dd23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -2234,7 +2234,7 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
             $aTHemes = TemplateConfiguration::model()->findAll();
 
             foreach ($aTHemes as $oTheme){
-                $oTheme->setGlobalOptionOn("ajaxmode");
+                $oTheme->setGlobalOption("ajaxmode", "on");
             }
 
             $oDB->createCommand()->update('{{settings_global}}', ['stg_value'=>351], "stg_name='DBVersion'");

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -616,17 +616,20 @@ public function getHasOptionPage()
     }
 
     /**
-     * Turn ON a given option at global setting level (survey level not affected)
+     * Set a value on a given option at global setting level (survey level not affected).
      * Will be used to turn ON ajax mode on update. 
+     *
+     * @param string $name
+     * @param string $value
+     * @return void
      */
-    public function setGlobalOptionOn($optionName="ajaxmode")
+    public function setGlobalOption($name, $value)
     {
-
         if ($this->options != 'inherit') {
             $oOptions = json_decode($this->options);
 
-            if ($oOptions->$optionName === "off" && empty($this->sid)){
-                $oOptions->$optionName = "on";
+            if (empty($this->sid)) {
+                $oOptions->$name = $value;
                 $sOptions = json_encode($oOptions);
                 $this->options = $sOptions;
                 $this->save();