diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-09 22:24:10 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-09 22:24:10 -0400 |
| commit | 820ed7a17d646f473579c26261ecf0387cb24ce4 (patch) | |
| tree | c60010dac8eed4ce462d74cf4483890a24d7bb49 | |
| parent | 52316bb3f55235cc3e6bd3317c83b391a80c66da (diff) | |
| parent | ccb78f74a4e3e86cefa2e36b64ca0e55451b7416 (diff) | |
| download | forums-820ed7a17d646f473579c26261ecf0387cb24ce4.tar forums-820ed7a17d646f473579c26261ecf0387cb24ce4.tar.gz forums-820ed7a17d646f473579c26261ecf0387cb24ce4.tar.bz2 forums-820ed7a17d646f473579c26261ecf0387cb24ce4.tar.xz forums-820ed7a17d646f473579c26261ecf0387cb24ce4.zip | |
Merge remote-tracking branch 'bantu/ticket/9999' into develop-olympus
* bantu/ticket/9999:
[ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
[ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
| -rw-r--r-- | phpBB/includes/functions_display.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index acaef49fe8..d7422aa2c9 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -477,7 +477,6 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'SUBFORUMS' => $s_subforums_list, 'L_SUBFORUM_STR' => $l_subforums, - 'L_FORUM_FOLDER_ALT' => $folder_alt, 'L_MODERATOR_STR' => $l_moderator, 'U_UNAPPROVED_TOPICS' => ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_topics&f=' . $row['forum_id_unapproved_topics']) : '', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 731f674120..e74c9ea0e4 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -530,6 +530,7 @@ $lang = array_merge($lang, array( 'SEARCH_TOPIC' => 'Search this topic…', 'SEARCH_UNANSWERED' => 'View unanswered posts', 'SEARCH_UNREAD' => 'View unread posts', + 'SEARCH_USER_POSTS' => 'Search user’s posts', 'SECONDS' => 'Seconds', 'SELECT' => 'Select', 'SELECT_ALL_CODE' => 'Select all', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 213f766610..e71f9d6565 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -116,7 +116,6 @@ $lang = array_merge($lang, array( 'REMOVE_FOE' => 'Remove foe', 'REMOVE_FRIEND' => 'Remove friend', - 'SEARCH_USER_POSTS' => 'Search user’s posts', 'SELECT_MARKED' => 'Select marked', 'SELECT_SORT_METHOD' => 'Select sort method', 'SEND_AIM_MESSAGE' => 'Send AIM message', |