Skip to content

Commit

Permalink
Member "change history" generates warning #1516
Browse files Browse the repository at this point in the history
  • Loading branch information
Fasse committed Nov 4, 2023
1 parent 1a2007b commit 0336708
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions adm_program/languages/de.xml
Expand Up @@ -707,6 +707,7 @@
<string name="SYS_DELETE_ROLE_DESC">Willst du die Rolle #VAR1_BOLD# wirklich löschen?\n\nEs werden damit auch alle Mitgliedschaften endgültig entfernt.</string>
<string name="SYS_DELETE_SYSTEM_CATEGORY">Du darfst keine Systemkategorien löschen.</string>
<string name="SYS_DELETE_SYSTEM_ROLE">Du kannst die Systemrolle #VAR1_BOLD# nicht löschen.</string>
<string name="SYS_DELETED_ENTRY">Gelöschter Eintrag</string>
<string name="SYS_DELETED_USER">Gelöschte Person</string>
<string name="SYS_DELIVERY_CONFIRMATION">Lesebestätigung anfordern</string>
<string name="SYS_DELIVERY_CONFIRMATION_DESC">Ist diese Option aktiviert, hat der Verfasser einer E-Mail die Möglichkeit eine Lesebestätigung anzufordern. Es hängt allerdings von den Einstellungen des E-Mailprogramms des Empfangenden ab, ob eine Lesebestätigung versendet wird. Der Empfangende kann dies auf seinen Wunsch unterdrücken.</string>
Expand Down
1 change: 1 addition & 0 deletions adm_program/languages/en.xml
Expand Up @@ -707,6 +707,7 @@
<string name="SYS_DELETE_ROLE_DESC">Are you sure you want to delete the role #VAR1_BOLD#?\n\nAll memberships will also be removed permanently.</string>
<string name="SYS_DELETE_SYSTEM_CATEGORY">You can not delete system categories.</string>
<string name="SYS_DELETE_SYSTEM_ROLE">You can not delete the system role #VAR1_BOLD#.</string>
<string name="SYS_DELETED_ENTRY">Deleted entry</string>
<string name="SYS_DELETED_USER">Deleted user</string>
<string name="SYS_DELIVERY_CONFIRMATION">Request delivery confirmation</string>
<string name="SYS_DELIVERY_CONFIRMATION_DESC">When enabled, the author of an e-mail has the opportunity to request a delivery confirmation. However, it depends on the settings of the recipients email program, whether a delivery confirmation is sent. The recipient may suppress its transmission.</string>
Expand Down
8 changes: 6 additions & 2 deletions adm_program/system/classes/ProfileFields.php
Expand Up @@ -205,7 +205,7 @@ public function getPropertyByUuid(string $fieldUuid, string $column, string $for
*/
public function getHtmlValue($fieldNameIntern, $value, $value2 = '')
{
global $gSettingsManager;
global $gSettingsManager, $gL10n;

if (!array_key_exists($fieldNameIntern, $this->mProfileFields)) {
return $value;
Expand Down Expand Up @@ -298,7 +298,11 @@ public function getHtmlValue($fieldNameIntern, $value, $value2 = '')
}

if(count($arrListValuesWithKeys) > 0) {
$htmlValue = $arrListValuesWithKeys[$value];
if(array_key_exists($value, $arrListValuesWithKeys)) {
$htmlValue = $arrListValuesWithKeys[$value];
} else {
$htmlValue = '<i>'.$gL10n->get('SYS_DELETED_ENTRY').'</i>';
}
} else {
$htmlValue = '';
}
Expand Down

0 comments on commit 0336708

Please sign in to comment.