From 6435eb129382d5006a9fa0469dac6f9554155b58 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 29 Jul 2019 11:21:38 +0200 Subject: [PATCH] * Api: fix error adding/editing catgories or custom fields --- admin/inc/class.admin_categories.inc.php | 2 +- admin/inc/class.admin_customfields.inc.php | 2 +- api/src/Header/Authenticate.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/inc/class.admin_categories.inc.php b/admin/inc/class.admin_categories.inc.php index 3dbd3d5db1..059e24717d 100644 --- a/admin/inc/class.admin_categories.inc.php +++ b/admin/inc/class.admin_categories.inc.php @@ -317,7 +317,7 @@ class admin_categories } Framework::includeJS('.','global_categories','admin'); - translation::add_app('admin'); + Api\Translation::add_app('admin'); $readonlys['button[delete]'] = !$content['id'] || !self::$acl_delete || // cant delete not yet saved category $appname != $content['appname'] || // Can't edit a category from a different app diff --git a/admin/inc/class.admin_customfields.inc.php b/admin/inc/class.admin_customfields.inc.php index 3b05906a3f..5161b1cea3 100644 --- a/admin/inc/class.admin_customfields.inc.php +++ b/admin/inc/class.admin_customfields.inc.php @@ -269,7 +269,7 @@ class admin_customfields // Make sure app css & lang get loaded, extending app might cause et2 to miss it Framework::includeCSS('admin','app'); - translation::add_app('admin'); + Api\Translation::add_app('admin'); $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields'); diff --git a/api/src/Header/Authenticate.php b/api/src/Header/Authenticate.php index 4ff35484df..1afef04274 100644 --- a/api/src/Header/Authenticate.php +++ b/api/src/Header/Authenticate.php @@ -115,7 +115,7 @@ class Authenticate { $realm .= ': '.$GLOBALS['egw']->session->reason; } - header('WWW-Authenticate: Basic realm="'.$realm.'"');// draft-reschke-basicauth-enc-06 adds, accept-charset="'.translation::charset().'"'); + header('WWW-Authenticate: Basic realm="'.$realm.'"');// draft-reschke-basicauth-enc-06 adds, accept-charset="'.Api\Translation::charset().'"'); self::digest_header($realm); header('HTTP/1.1 401 Unauthorized'); header('X-WebDAV-Status: 401 Unauthorized', true);