diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-09 22:28:35 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-09 22:28:35 -0400 |
| commit | 7cbbb301e11b20737551eb33d68c3194f8de362e (patch) | |
| tree | 4d9d2e90ad088719e6d05c94c44e7e8201010484 /phpBB/includes/functions_display.php | |
| parent | 208fc767611d32378b116d8269760b64cf455574 (diff) | |
| parent | 820ed7a17d646f473579c26261ecf0387cb24ce4 (diff) | |
| download | forums-7cbbb301e11b20737551eb33d68c3194f8de362e.tar forums-7cbbb301e11b20737551eb33d68c3194f8de362e.tar.gz forums-7cbbb301e11b20737551eb33d68c3194f8de362e.tar.bz2 forums-7cbbb301e11b20737551eb33d68c3194f8de362e.tar.xz forums-7cbbb301e11b20737551eb33d68c3194f8de362e.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
[ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index abc5b3e29f..407909a2f4 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -459,7 +459,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']) : '', |