diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-02-21 12:47:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-02-21 12:47:35 +0000 |
| commit | c74d2538ec68fa1c6f3da6d26e31a09f2045557b (patch) | |
| tree | be1c11d7d9e403c7b884c7d08e34111f0806d350 /phpBB/includes/ucp/ucp_main.php | |
| parent | 9c12fe83db3914b4e35bdcef75cc70e2f75044d6 (diff) | |
| download | forums-c74d2538ec68fa1c6f3da6d26e31a09f2045557b.tar forums-c74d2538ec68fa1c6f3da6d26e31a09f2045557b.tar.gz forums-c74d2538ec68fa1c6f3da6d26e31a09f2045557b.tar.bz2 forums-c74d2538ec68fa1c6f3da6d26e31a09f2045557b.tar.xz forums-c74d2538ec68fa1c6f3da6d26e31a09f2045557b.zip | |
- put consoring and smilie processing into functions (we use them all over the place) for better changing and consistency.
- changed docs/AUTHORS to reflect the recent code re-use in functions_messenger.php
- pleasing the users a little bit more by using table constants. :D
- login box if "mode" is not allowed -> posting (thought about trigger_error integration, but we do not need this that often).
git-svn-id: file:///svn/phpbb/trunk@4836 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_main.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 96eddfe3de..c7783b88b9 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -15,7 +15,7 @@ class ucp_main extends module { function ucp_main($id, $mode) { - global $censors, $config, $db, $user, $auth, $SID, $template, $phpbb_root_path, $phpEx; + global $config, $db, $user, $auth, $SID, $template, $phpbb_root_path, $phpEx; switch ($mode) { @@ -127,7 +127,7 @@ class ucp_main extends module 'TOPIC_ID' => $topic_id, 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), 'LAST_POST_AUTHOR' => $last_post_author, - 'TOPIC_TITLE' => (!empty($censors)) ? preg_replace($censors['match'], $censors['replace'], $row['topic_title']) : $row['topic_title'], + 'TOPIC_TITLE' => censor_text($row['topic_title']), 'TOPIC_TYPE' => $topic_type, 'LAST_POST_IMG' => $last_post_img, @@ -483,7 +483,7 @@ class ucp_main extends module 'LAST_POST_TIME' => $user->format_date($row['topic_last_post_time']), 'LAST_POST_AUTHOR' => $last_post_author, 'GOTO_PAGE' => $goto_page, - 'TOPIC_TITLE' => (!empty($censors)) ? preg_replace($censors['match'], $censors['replace'], $row['topic_title']) : $row['topic_title'], + 'TOPIC_TITLE' => censor_text($row['topic_title']), 'TOPIC_TYPE' => $topic_type, 'LAST_POST_IMG' => $last_post_img, |