From f7989fc2c8aefa31788de4e193c2b86cd0dfa2a0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Wed, 4 Mar 2020 20:50:32 +0100
Subject: [PATCH] Revert "some fixes for errors in phpUnit in CalDAV tests"

This reverts commit 9d38bf3e97c0e0e87a5ce9172abb167d147282d8.
---
 setup/inc/functions.inc.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php
index b8261eebee..e24cbd8a9f 100644
--- a/setup/inc/functions.inc.php
+++ b/setup/inc/functions.inc.php
@@ -25,9 +25,9 @@ $GLOBALS['egw_info'] = array(
 		'currentapp' => 'setup',
 		'noapi' => True
 ));
-if(file_exists(__DIR__.'/../../header.inc.php'))
+if(file_exists('../header.inc.php'))
 {
-	include_once(__DIR__.'/../../header.inc.php');
+	include('../header.inc.php');
 }
 // for an old header we need to setup a reference for the domains
 if (!is_array($GLOBALS['egw_domain'])) $GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
@@ -56,17 +56,14 @@ require_once(EGW_INCLUDE_ROOT . '/api/src/loader/common.php');
  * function to handle multilanguage support
  *
  */
-if (!function_exists('lang'))
+function lang($key,$vars=null)
 {
-	function lang($key, $vars = null)
+	if(!is_array($vars))
 	{
-		if (!is_array($vars))
-		{
-			$vars = func_get_args();
-			array_shift($vars);    // remove $key
-		}
-		return $GLOBALS['egw_setup']->translation->translate("$key", $vars);
+		$vars = func_get_args();
+		array_shift($vars);	// remove $key
 	}
+	return $GLOBALS['egw_setup']->translation->translate("$key", $vars);
 }
 
 if(file_exists(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'))