aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_admin.php4
-rw-r--r--phpBB/includes/functions_posting.php2
-rw-r--r--phpBB/language/en/acp/common.php4
-rw-r--r--phpBB/styles/prosilver/template/overall_footer.html7
4 files changed, 10 insertions, 7 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 20a6ff9eee..c83f26270f 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2422,8 +2422,10 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id
$log[$i]['action'] .= '<br />' . implode('', $log_data_ary);
}
- // Apply make_clickable... has to be seen if it is for good. :/
+ /* Apply make_clickable... has to be seen if it is for good. :/
+ // Seems to be not for the moment, reconsider later...
$log[$i]['action'] = make_clickable($log[$i]['action']);
+ */
}
$i++;
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 2cbfd56adc..becd792388 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1520,7 +1520,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
if ($user->data['user_id'] != $poster_id)
{
$log_subject = ($subject) ? $subject : $data['topic_title'];
- add_log('mod', $data['forum_id'], $data['topic_id'], 'LOG_POST_EDITED', $log_subject, generate_board_url() . '/viewtopic.' . $phpEx . '?t=' . $data['topic_id'] . '&amp;p=' . $data['post_id'], $username);
+ add_log('mod', $data['forum_id'], $data['topic_id'], 'LOG_POST_EDITED', $log_subject, (!empty($username)) ? $username : $user->lang['GUEST']);
}
if (!isset($sql_data[POSTS_TABLE]['sql']))
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 9d3a68120c..9d8661b7ea 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -464,8 +464,8 @@ $lang = array_merge($lang, array(
'LOG_MERGE' => '<strong>Merged posts</strong> into topic<br />» %s',
'LOG_MOVE' => '<strong>Moved topic</strong><br />» from %s',
'LOG_POST_APPROVED' => '<strong>Approved post</strong><br />» %s',
- 'LOG_POST_DISAPPROVED' => '<strong>Disapproved post “%1$s” with the following reason</strong><br />%2$s',
- 'LOG_POST_EDITED' => '<strong>Edited post “%1$s” written by “%3$s”</strong><br />» Link to post: %2$s',
+ 'LOG_POST_DISAPPROVED' => '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s',
+ 'LOG_POST_EDITED' => '<strong>Edited post “%1$s” written by</strong><br />» %2$s',
'LOG_REPORT_CLOSED' => '<strong>Closed report</strong><br />» %s',
'LOG_REPORT_DELETED' => '<strong>Deleted report</strong><br />» %s',
'LOG_SPLIT_DESTINATION' => '<strong>Moved splitted posts</strong><br />» to %s',
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index cbd2d7ae12..eee1e394ae 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -41,9 +41,10 @@
</div>
-<div><a id="bottom" name="bottom" accesskey="z"></a></div>
-
-<!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
+<div>
+ <a id="bottom" name="bottom" accesskey="z"></a>
+ <!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF -->
+</div>
</body>
</html> \ No newline at end of file