makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2019-03-31 11:25:49 +02:00
commit c4c19d5a7c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_pm_viewfolder.php
View file

@ -39,7 +39,7 @@ function view_folder($id, $mode, $folder_id, $folder)
// Grab icons
$icons = $cache->obtain_icons();
$color_rows = array('marked', 'replied');
$color_rows = array('message_reported', 'marked', 'replied');
$_module = new p_master();
$_module->list_modules('ucp');

1
phpBB/language/en/ucp.php
View file

@ -302,6 +302,7 @@ $lang = array_merge($lang, array(
'MESSAGE_EDITED' => 'Message successfully edited.',
'MESSAGE_HISTORY' => 'Message history',
'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message was deleted by its author.',
'MESSAGE_REPORTED_MESSAGE' => 'Reported message',
'MESSAGE_SENT_ON' => 'on',
'MESSAGE_STORED' => 'This message has been sent successfully.',
'MESSAGE_TO' => 'To',

4
phpBB/styles/prosilver/theme/cp.css
View file

@ -315,12 +315,16 @@ ol.def-rules li {
padding: 0 3px;
}
/* DEPRECATED 3.2.6
.pmlist li.pm_message_reported_colour,
.pm_message_reported_colour {
border-right-color: transparent;
border-left-color: transparent;
}
*/
.pmlist li.pm_message_reported_colour,
.pm_message_reported_colour,
.pmlist li.pm_marked_colour,
.pm_marked_colour,
.pmlist li.pm_replied_colour,