Merge branch 'feature-7423/infocenter_udf_schule_job' into feature/infocenter_anpassungen

application/libraries/UDFLib.php

@@ -312,10 +312,10 @@ class UDFLib
 			{
 				$resultElement->{$columnName} = $columnValue;
 			}
-		}
 
-		// And finally remove the UDFs column
-		unset($resultElement->{self::COLUMN_NAME});
+			// And finally remove the UDFs column
+			unset($resultElement->{self::COLUMN_NAME});
+		}
 	}
 
 	/**

include/statistik.class.php

@@ -510,7 +510,7 @@ class statistik extends basis_db
 		$this->html='';
 		$this->csv='';
 		$this->json=array();
-		set_time_limit(60);
+		set_time_limit(120);
 
 		if($this->sql!='')
 		{

system/phrasesupdate.php

@@ -12872,6 +12872,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'eucovidqr',
+		'phrase' => 'supportbeschreibung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Bei technischen Problemen kontaktieren Sie bitte: ",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "in case of technical issues please contact: ",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );