diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-07-23 20:59:08 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-07-23 20:59:08 +0000 |
| commit | 4680dfce39f98f9953dea493af8c2245e0570649 (patch) | |
| tree | eb5d6dc3bc058314cc0da9995779623b8d5f9039 | |
| parent | 5e7f9e1a0d07df18f3cb330ad48901bf5a2941db (diff) | |
| download | forums-4680dfce39f98f9953dea493af8c2245e0570649.tar forums-4680dfce39f98f9953dea493af8c2245e0570649.tar.gz forums-4680dfce39f98f9953dea493af8c2245e0570649.tar.bz2 forums-4680dfce39f98f9953dea493af8c2245e0570649.tar.xz forums-4680dfce39f98f9953dea493af8c2245e0570649.zip | |
Include a link to the post by default when issuing a warning
git-svn-id: file:///svn/phpbb/trunk@6203 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rwxr-xr-x | phpBB/includes/mcp/mcp_warn.php | 3 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 2 | ||||
| -rwxr-xr-x | phpBB/install/install_main.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 1 | ||||
| -rwxr-xr-x | phpBB/styles/subSilver/template/mcp_warn_post.html | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index a83fa30211..87ed6e93c8 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -188,6 +188,7 @@ function mcp_warn_post_view($id, $mode, $action) global $template, $db, $user, $auth; $post_id = request_var('p', 0); + $forum_id = request_var('f', 0); $notify = (isset($_REQUEST['notify_user'])) ? true : false; $warning = request_var('warning', '', true); @@ -296,6 +297,8 @@ function mcp_warn_post_view($id, $mode, $action) 'AVATAR_IMG' => $avatar_img, 'RANK_IMG' => $rank_img, + + 'L_WARNING_POST_DEFAULT' => sprintf($user->lang['WARNING_POST_DEFAULT'], generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&p=$post_id"), ) ); } diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 66f121ad19..14b703e29f 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -54,7 +54,7 @@ class install_install extends module 'TITLE' => $lang['INSTALL_INTRO'], 'BODY' => $lang['INSTALL_INTRO_BODY'], 'L_SUBMIT' => $lang['NEXT'], - 'S_LANG_SELECT' => '<select name="language">' . $this->p_master->inst_language_select() . '</select>', + 'S_LANG_SELECT' => '<select name="language">' . $this->p_master->inst_language_select($language) . '</select>', 'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language", )); diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php index f1ad12ccd4..3b69a67cd7 100755 --- a/phpBB/install/install_main.php +++ b/phpBB/install/install_main.php @@ -43,7 +43,7 @@ class install_main extends module function main($mode, $sub) { - global $lang, $template; + global $lang, $template, $language; switch ($sub) { @@ -70,7 +70,7 @@ class install_main extends module 'TITLE' => $title, 'BODY' => $body, - 'S_LANG_SELECT' => '<select name="language">' . $this->p_master->inst_language_select() . '</select>', + 'S_LANG_SELECT' => '<select name="language">' . $this->p_master->inst_language_select($language) . '</select>', )); } } diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index f18b934ddc..2db565acb2 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -324,6 +324,7 @@ $lang = array_merge($lang, array( 'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them', 'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]', 'WARNING_PM_SUBJECT' => 'Board Warning Issued', + 'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s', 'WARNINGS_ZERO_TOTAL' => 'No warnings exists', 'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s', diff --git a/phpBB/styles/subSilver/template/mcp_warn_post.html b/phpBB/styles/subSilver/template/mcp_warn_post.html index dfb79fae43..896f813d75 100755 --- a/phpBB/styles/subSilver/template/mcp_warn_post.html +++ b/phpBB/styles/subSilver/template/mcp_warn_post.html @@ -42,7 +42,7 @@ <tr> <td class="row3" align="center"><span class="genmed">{L_ADD_WARNING_EXPLAIN}</span></td> <tr> - <td class="row1" align="center"><textarea name="warning" rows="10" cols="76"></textarea></td> + <td class="row1" align="center"><textarea name="warning" rows="10" cols="76">{L_WARNING_POST_DEFAULT}</textarea></td> </tr> <tr> <td class="row1" align="center"><input type="checkbox" class="radio" name="notify_user" checked="checked" /><span class="genmed">{L_NOTIFY_USER_WARN}</span></td> |