From 38d8ea33f74562edef689aaa51d0fa858b93e1a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 2 Nov 2018 11:50:56 +0100
Subject: [PATCH] Reverted and corrected last Commit

---
 include/dvb.class.php        | 4 ++--
 soap/datenverbund_client.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/dvb.class.php b/include/dvb.class.php
index 7afd30c23..994896bc6 100644
--- a/include/dvb.class.php
+++ b/include/dvb.class.php
@@ -449,7 +449,7 @@ class dvb extends basis_db
 			else
 			{
 				$this->errormsg = '';
-				return ErrorHandler::error();
+				return ErrorHandler::success();
 			}
 		}
 		else
@@ -606,7 +606,7 @@ class dvb extends basis_db
 			else
 			{
 				$this->errormsg = '';
-				return ErrorHandler::error();
+				return ErrorHandler::success();
 			}
 		}
 		else
diff --git a/soap/datenverbund_client.php b/soap/datenverbund_client.php
index 378ee87b7..028637948 100644
--- a/soap/datenverbund_client.php
+++ b/soap/datenverbund_client.php
@@ -185,7 +185,7 @@ if (isset($_REQUEST['submit']))
 		case 'getBySvnr':
 			$data = $dvb->getMatrikelnrBySVNR($_POST['svnr']);
 
-			if(ErrorHandler::isSuccess($data))
+			if(ErrorHandler::isSuccess($data) && ErrorHandler::hasData($data))
 			{
 					echo '<br><b>Matrikelnummer vorhanden:</b> '.$data->retval->matrikelnummer;
 					if(isset($data->retval->bpk) && $data->retval->bpk!='')
@@ -200,7 +200,7 @@ if (isset($_REQUEST['submit']))
 		case 'getByErsatzkennzeichen':
 			$data = $dvb->getMatrikelnrByErsatzkennzeichen($_POST['ersatzkennzeichen']);
 
-			if (ErrorHandler::isSuccess($data))
+			if (ErrorHandler::isSuccess($data) && ErrorHandler::hasData($data))
 				echo '<br><b>Matrikelnummer vorhanden:</b>'.$data->retval->matrikelnummer;
 			else
 				echo '<br><b>Matrikelnummer nicht vorhanden:</b>'.$dvb->errormsg;