From c83674fc41c6a5926d790ccab2d7ee53013d488b Mon Sep 17 00:00:00 2001
From: chfhtw <christopher.hacker@technikum-wien.at>
Date: Thu, 23 Jul 2026 15:05:11 +0200
Subject: [PATCH] StudentListLib: store where clauses and add it in later in
 execute function to prevent errors like in Task:78115

---
 application/libraries/stv/StudentListLib.php | 27 ++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/application/libraries/stv/StudentListLib.php b/application/libraries/stv/StudentListLib.php
index 6d1e047e8..7a8d987a3 100644
--- a/application/libraries/stv/StudentListLib.php
+++ b/application/libraries/stv/StudentListLib.php
@@ -28,6 +28,7 @@ class StudentListLib
 	private $_allowedStgs = [];
 	private $_selects = [];
 	private $_joins = [];
+	private $_wheres = [];
 	
 	/**
 	 * Gets the CI instance, loads model and prepares default values
@@ -260,11 +261,7 @@ class StudentListLib
 	 */
 	public function addWhere($key, $value = null, $escape = true)
 	{
-		if (!is_array($key) && is_array($value)) {
-			$this->_ci->PrestudentModel->db->where_in($key, $value, $escape);
-		} else {
-			$this->_ci->PrestudentModel->db->where($key, $value, $escape);
-		}
+		$this->_wheres[] = [$key, $value, $escape, false];
 	}
 
 	/**
@@ -278,11 +275,7 @@ class StudentListLib
 	 */
 	public function addOrWhere($key, $value = null, $escape = true)
 	{
-		if (!is_array($key) && is_array($value)) {
-			$this->_ci->PrestudentModel->db->or_where_in($key, $value, $escape);
-		} else {
-			$this->_ci->PrestudentModel->db->or_where($key, $value, $escape);
-		}
+		$this->_wheres[] = [$key, $value, $escape, true];
 	}
 
 	/**
@@ -326,6 +319,20 @@ class StudentListLib
 		foreach ($this->_selects as $select)
 			$this->_ci->PrestudentModel->addSelect($select[0], $select[1]);
 
+		foreach ($this->_wheres as $where) {
+			if (!is_array($where[0]) && is_array($where[1])) {
+				if ($where[3])
+					$this->_ci->PrestudentModel->db->or_where_in($where[0], $where[1], $where[2]);
+				else
+					$this->_ci->PrestudentModel->db->where_in($where[0], $where[1], $where[2]);
+			} else {
+				if ($where[3])
+					$this->_ci->PrestudentModel->db->or_where($where[0], $where[1], $where[2]);
+				else
+					$this->_ci->PrestudentModel->db->where($where[0], $where[1], $where[2]);
+			}
+		}
+
 		$this->_ci->PrestudentModel->addOrder('nachname');
 		$this->_ci->PrestudentModel->addOrder('vorname');