diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-08-06 23:17:40 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-08-06 23:17:40 +0000 |
| commit | 64708e6bd2979167a380fd33be990552da370110 (patch) | |
| tree | 833b14bf499d34a7f6acad40e2655178f887da7b | |
| parent | ffcdb3e2454ff9c6d6701894064b9d188ec1f2a0 (diff) | |
| download | forums-64708e6bd2979167a380fd33be990552da370110.tar forums-64708e6bd2979167a380fd33be990552da370110.tar.gz forums-64708e6bd2979167a380fd33be990552da370110.tar.bz2 forums-64708e6bd2979167a380fd33be990552da370110.tar.xz forums-64708e6bd2979167a380fd33be990552da370110.zip | |
#13968
git-svn-id: file:///svn/phpbb/trunk@8014 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 1f6935fd47..4e78bd663b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -205,6 +205,7 @@ p a { <li>[Change] Made group avatar/rank changes more intuitive</li> <li>[Fix] Give more feedback in icon/smilie management (Bug #13295)</li> <li>[Fix] Correctly set user::lang_id (Bug #14010)</li> + <li>[Fix] Properly display the smiley export screen (Bug #13968)</li> </ul> </div> diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 813c8e0f14..56a660ced2 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -615,7 +615,10 @@ class acp_icons $template->assign_vars(array( 'MESSAGE_TITLE' => $user->lang['EXPORT_' . $lang], - 'MESSAGE_TEXT' => sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '<a href="' . $this->u_action . '&action=send">', '</a>')) + 'MESSAGE_TEXT' => sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '<a href="' . $this->u_action . '&action=send">', '</a>'), + + 'S_USER_NOTICE' => true, + ) ); return; |