From 75160b12821f7f4299cce7f0b69c83c1502ae071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Mon, 27 May 2024 13:08:29 +0200 Subject: 2024-02-19 upstream --- admin/survey/classes/surveyData/class.SurveyDataFile.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'admin/survey/classes/surveyData/class.SurveyDataFile.php') diff --git a/admin/survey/classes/surveyData/class.SurveyDataFile.php b/admin/survey/classes/surveyData/class.SurveyDataFile.php index 29482d7..6cb591a 100644 --- a/admin/survey/classes/surveyData/class.SurveyDataFile.php +++ b/admin/survey/classes/surveyData/class.SurveyDataFile.php @@ -134,9 +134,9 @@ class SurveyDataFile { foreach ($this->HEADER AS $_vkey => $variable) { # dodamo samo tiste variable, ki imajo numerični tip (navadne spremenljvke) - if (is_numeric($variable['tip'] ) + if ( (isset($variable['tip']) && is_numeric($variable['tip'])) # ne dodamo sistemskih email, telefon, ime, priimek, naziv - && !( (int)$variable['hide_system'] == 1 + && !( (isset($variable['hide_system']) && (int)$variable['hide_system'] == 1) && in_array($variable['variable'],unserialize (SYSTEM_VARIABLES)) )# unserialize (SYSTEM_VARIABLES) -> definition.php = array('email','telefon','ime','priimek','naziv','drugo') ) { # če filter ni setiran dodamo vse variable @@ -319,7 +319,8 @@ class SurveyDataFile { // Preverimo ce prej nismo imeli testnih podatkov $settings = $this->getHeaderVariable('_settings'); - if($settings['hasTestData'] != 1 && $this->has_test_data > 0){ + + if((!isset($settings['hasTestData']) || $settings['hasTestData'] != 1) && $this->has_test_data > 0){ return true; } -- cgit v1.2.3