Merge branch 'master' into feature-25999/C4_ma0594dev

2026-07-24 02:12:17 +00:00 · 2024-02-15 15:16:07 +01:00
parent 6eeeb8b4b7 b4d6a46426
commit 04f6ee6156
175 changed files with 15086 additions and 1346 deletions
@@ -512,7 +512,10 @@ class statistik extends basis_db
 		$this->csv='';
 		$this->json=array();
 		$this->countRows=0;
-		set_time_limit(120);
+		set_time_limit(600);
+
+		// In case a decryption function is used then perform password substitution
+		$this->sql = $this->replaceSQLDecryptionPassword($this->sql);

 		if($this->sql!='')
 		{