extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict with lang() function, by just instanciating setup class

Browse Source
This commit is contained in:
Ralf Becker 2020-03-05 10:29:53 +01:00
parent 5154bc2f70
commit 77a7d538f5
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api/tests/CalDAVTest.php
View File

@ -217,14 +217,29 @@ abstract class CalDAVTest extends TestCase
*/ */
private static function getSetup() private static function getSetup()
{ {
if (!isset($_REQUEST['domain'])) static $setup=null;
if (!isset($setup))
{ {
$_REQUEST['domain'] = $GLOBALS['EGW_DOMAIN'] ?? 'default'; if (!isset($_REQUEST['domain']))
} {
$_REQUEST['ConfigDomain'] = $_REQUEST['domain']; $_REQUEST['domain'] = $GLOBALS['EGW_DOMAIN'] ?? 'default';
require_once __DIR__.'/../../setup/inc/functions.inc.php'; }
$_REQUEST['ConfigDomain'] = $_REQUEST['domain'];
return $GLOBALS['egw_setup']; $GLOBALS['egw_info'] = array(
'flags' => array(
'noheader' => True,
'nonavbar' => True,
'currentapp' => 'setup',
'noapi' => True
));
if (file_exists(__DIR__ . '/../../header.inc.php'))
{
include_once(__DIR__ . '/../../header.inc.php');
}
$setup = new \setup();
}
return $setup;
} }
/** /**