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

* Api: fix error adding/editing catgories or custom fields

Browse Source
This commit is contained in:
Ralf Becker 2019-07-29 11:21:38 +02:00
parent 1125857730
commit 6435eb1293
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/inc/class.admin_categories.inc.php
View File

@ -317,7 +317,7 @@ class admin_categories
} }
Framework::includeJS('.','global_categories','admin'); 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 $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 $appname != $content['appname'] || // Can't edit a category from a different app

2
admin/inc/class.admin_customfields.inc.php
View File

@ -269,7 +269,7 @@ class admin_customfields
// Make sure app css & lang get loaded, extending app might cause et2 to miss it // Make sure app css & lang get loaded, extending app might cause et2 to miss it
Framework::includeCSS('admin','app'); 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'); $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');

2
api/src/Header/Authenticate.php
View File

@ -115,7 +115,7 @@ class Authenticate
{ {
$realm .= ': '.$GLOBALS['egw']->session->reason; $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); self::digest_header($realm);
header('HTTP/1.1 401 Unauthorized'); header('HTTP/1.1 401 Unauthorized');
header('X-WebDAV-Status: 401 Unauthorized', true); header('X-WebDAV-Status: 401 Unauthorized', true);