diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-15 15:52:37 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-15 15:52:37 +0000 |
| commit | 7e05a3024be7da56b595115e6bbeb116b2f335b9 (patch) | |
| tree | aaca17e664bb3f093638c819a60f6161e9c5da15 /phpBB/includes | |
| parent | 51061920d6463b2722d42a5a3eed2b769091ad5e (diff) | |
| download | forums-7e05a3024be7da56b595115e6bbeb116b2f335b9.tar forums-7e05a3024be7da56b595115e6bbeb116b2f335b9.tar.gz forums-7e05a3024be7da56b595115e6bbeb116b2f335b9.tar.bz2 forums-7e05a3024be7da56b595115e6bbeb116b2f335b9.tar.xz forums-7e05a3024be7da56b595115e6bbeb116b2f335b9.zip | |
#10942 + cron image into <p></p> tags
git-svn-id: file:///svn/phpbb/trunk@7589 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 |
2 files changed, 4 insertions, 2 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'] . '&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'])) |