Skip to content

Commit

Permalink
Fix emojis and allow emojis in message subject line
Browse files Browse the repository at this point in the history
  • Loading branch information
rmcgirr83 committed Jul 28, 2023
1 parent 0d4447a commit 8f7288d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"name": "apwa/pmwelcome",
"type": "phpbb-extension",
"description": "Welcome PM for registration and activation",
"version": "1.2.13",
"time": "2023-07-27",
"version": "1.3.0",
"time": "2023-07-28",
"license": "GPL-2.0-only",
"authors": [
{
Expand Down
4 changes: 2 additions & 2 deletions controller/admin_controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function display_options()
{
generate_text_for_storage(
$pmwelcome_post_text,
$pmwelcome_text_uid ,
$pmwelcome_text_uid,
$pmwelcome_text_bitfield,
$pmwelcome_text_flags,
!$this->request->variable('disable_bbcode', false),
Expand All @@ -187,9 +187,9 @@ public function display_options()
'pmwelcome_text_flags' => $pmwelcome_text_flags,
));

$this->config->set('pmwelcome_subject', utf8_encode_ucr($pmwelcome_subject));
$this->config->set('pmwelcome_sender', (string) $sender_info['username']);
$this->config->set('pmwelcome_user', (int) $sender_info['user_id']);
$this->config->set('pmwelcome_subject', $pmwelcome_subject);

// and an entry into the log table
$this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_PMWELCOME_CONFIG_UPDATE');
Expand Down
1 change: 0 additions & 1 deletion event/listener.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ private function user_welcome($user_to)

// change the wording of the message if so desired
$pmwelcome_text = str_replace('{SENDER}', $this->config['pmwelcome_sender'], $pmwelcome_text);
generate_text_for_storage($pmwelcome_text, $uid, $bitfield, $flags, $allow_bbcode, $allow_urls, $allow_smilies);

if (!function_exists('submit_pm'))
{
Expand Down

0 comments on commit 8f7288d

Please sign in to comment.