diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-02-05 01:40:45 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-02-05 01:40:45 +0000 |
| commit | db145d79b312ffb2d460c7a0d9f0a51f6f07f9d5 (patch) | |
| tree | d5ed1f21e67aa1e41661ce497445bb809690a054 /phpBB/viewtopic.php | |
| parent | b09c5f6a2589d8bc6e4855d59aeb5556057ed9db (diff) | |
| download | forums-db145d79b312ffb2d460c7a0d9f0a51f6f07f9d5.tar forums-db145d79b312ffb2d460c7a0d9f0a51f6f07f9d5.tar.gz forums-db145d79b312ffb2d460c7a0d9f0a51f6f07f9d5.tar.bz2 forums-db145d79b312ffb2d460c7a0d9f0a51f6f07f9d5.tar.xz forums-db145d79b312ffb2d460c7a0d9f0a51f6f07f9d5.zip | |
- removed unnecessary urlencode of highlight words
various mcp_main updates:
- generally make all the tools work again (mode/action changes)
- tidy up urls
- restructured quickmod code to use actions (we don't want too many module entries)
git-svn-id: file:///svn/phpbb/trunk@5526 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 51e29b388f..454dca6d27 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -338,7 +338,7 @@ if ($hilit_words) { if (trim($word)) { - $highlight_match .= (($highlight_match != '') ? '|' : '') . str_replace('\*', '\w*?', preg_quote(urlencode($word), '#')); + $highlight_match .= (($highlight_match != '') ? '|' : '') . str_replace('*', '\w*?', preg_quote($word, '#')); } } @@ -486,7 +486,7 @@ $template->assign_vars(array( 'S_SELECT_SORT_KEY' => $s_sort_key, 'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_TOPIC_ACTION' => "{$phpbb_root_path}viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id&start=$start", - 'S_TOPIC_MOD' => ($topic_mod != '') ? '<select name="mode">' . $topic_mod . '</select>' : '', + 'S_TOPIC_MOD' => ($topic_mod != '') ? '<select name="action">' . $topic_mod . '</select>' : '', 'S_MOD_ACTION' => "{$phpbb_root_path}mcp.$phpEx?sid=" . $user->session_id . "&t=$topic_id&f=$forum_id&quickmod=1", 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('f_search', $forum_id)) ? true : false, |