Dev: small bug in database.php

LimeSurvey · Aug 21, 2017 · f461539 · f461539
1 parent 5f8fe9b
commit f461539
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -1229,24 +1229,24 @@ private function actionUpdateSurveyLocaleSettings($iSurveyID)
 
     private function _filterEmptyFields(&$oSurvey, $fieldArrayName, $newValue=null){
         $aSurvey = $oSurvey->attributes;
-        $oldValue = $oSurvey->{$fieldArrayName};
+
         if($newValue === null)
         {
-            $newValue = App()->request->getPost($fieldArrayName, '');
+            $newValue = App()->request->getPost($fieldArrayName, NULL);
         }
 
-        $newValue = trim($newValue);
 
-        if(empty($newValue))
+        if($newValue === NULL)
         {
-
             $newValue = isset($aSurvey[$fieldArrayName]) ? $aSurvey[$fieldArrayName] : $oSurvey->{$fieldArrayName};
 
         } 
         else 
         {
             $this->updatedFields[] = $fieldArrayName;
         }
+
+        $newValue = trim($newValue);
 
         $options = $this->updateableFields[$fieldArrayName];
         switch($options['type']){