From d8d3d0d43e9d4ea566cd212ba9c827e98c8cab16 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 22 Feb 2022 18:54:46 +0100
Subject: [PATCH] Termination::getPop() uses ist_pop_id before pop_id

---
 application/Termination/Termination.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/Termination/Termination.php b/application/Termination/Termination.php
index 7477e98c6..848388ca7 100644
--- a/application/Termination/Termination.php
+++ b/application/Termination/Termination.php
@@ -153,10 +153,16 @@ class Termination extends mfBaseModel {
   }
   
   public function getPop() {
-    $pop_id = $this->getWorkflowvalue('pop_id');
+    $pop_id = $this->getWorkflowvalue('ist_pop_id');
+    if(!$pop_id) {
+      $pop_id = $this->getWorkflowvalue('pop_id');
+      return null;
+    }
+    
     if(!$pop_id) {
       return null;
     }
+    
     return new Pop($pop_id);
   }