diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-08-31 19:08:11 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-08-31 19:08:11 +0200 |
| commit | 05e6ed04ed48e321990125059e64e2d1592d69c4 (patch) | |
| tree | 48a594f19fef04e4d3096f4f624cea7df47cda22 | |
| parent | 2c6543cb6e066adce2fc9e2273fa2efea1e29b53 (diff) | |
| parent | d737430a03dc9efa1633c13251fdb235540fdb3d (diff) | |
| download | forums-05e6ed04ed48e321990125059e64e2d1592d69c4.tar forums-05e6ed04ed48e321990125059e64e2d1592d69c4.tar.gz forums-05e6ed04ed48e321990125059e64e2d1592d69c4.tar.bz2 forums-05e6ed04ed48e321990125059e64e2d1592d69c4.tar.xz forums-05e6ed04ed48e321990125059e64e2d1592d69c4.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14673] Changes wrong language variable in mcp_forum
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index dc4d59cc46..e381210331 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -274,7 +274,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info) 'TOPIC_ICON_IMG_WIDTH' => (!empty($icons[$row_ary['icon_id']])) ? $icons[$row_ary['icon_id']]['width'] : '', 'TOPIC_ICON_IMG_HEIGHT' => (!empty($icons[$row_ary['icon_id']])) ? $icons[$row_ary['icon_id']]['height'] : '', 'UNAPPROVED_IMG' => ($topic_unapproved || $posts_unapproved) ? $user->img('icon_topic_unapproved', ($topic_unapproved) ? 'TOPIC_UNAPPROVED' : 'POSTS_UNAPPROVED') : '', - 'DELETED_IMG' => ($topic_deleted) ? $user->img('icon_topic_deleted', 'POSTS_DELETED') : '', + 'DELETED_IMG' => ($topic_deleted) ? $user->img('icon_topic_deleted', 'TOPIC_DELETED') : '', 'TOPIC_AUTHOR' => get_username_string('username', $row_ary['topic_poster'], $row_ary['topic_first_poster_name'], $row_ary['topic_first_poster_colour']), 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row_ary['topic_poster'], $row_ary['topic_first_poster_name'], $row_ary['topic_first_poster_colour']), |