diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-24 16:16:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-24 16:16:39 +0000 |
| commit | f813c7ad0d391c078d014138eb4d60c2233f7c1f (patch) | |
| tree | 0d7f0b0a241e366864dc6dbb5c30793562092ecf /phpBB | |
| parent | a1d05f29a4d60f191151b5f1bf959a53698f7b16 (diff) | |
| download | forums-f813c7ad0d391c078d014138eb4d60c2233f7c1f.tar forums-f813c7ad0d391c078d014138eb4d60c2233f7c1f.tar.gz forums-f813c7ad0d391c078d014138eb4d60c2233f7c1f.tar.bz2 forums-f813c7ad0d391c078d014138eb4d60c2233f7c1f.tar.xz forums-f813c7ad0d391c078d014138eb4d60c2233f7c1f.zip | |
two fixes
git-svn-id: file:///svn/phpbb/trunk@7940 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 11 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_profile_fields.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/profile.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
7 files changed, 14 insertions, 7 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 80c7f09d6e..bad15bef30 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -77,14 +77,17 @@ <td>{L_GZIP_COMPRESSION}: </td> <td><strong>{GZIP_COMPRESSION}</strong></td> </tr> - <!-- IF S_TOTAL_ORPHAN --> <tr> - <td> </td> - <td> </td> + <td>{L_BOARD_VERSION}: </td> + <td><strong>{BOARD_VERSION}</strong></td> + <!-- IF S_TOTAL_ORPHAN --> <td>{L_NUMBER_ORPHAN}: </td> <td><strong>{TOTAL_ORPHAN}</strong></td> - </tr> + <!-- ELSE --> + <td> </td> + <td> </td> <!-- ENDIF --> + </tr> </tbody> </table> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index bab9d2403c..ebad2241cd 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -274,6 +274,8 @@ p a { <li>[Fix] Properly resync user post counts for users that have no posts (Bug #13581)</li> <li>[Fix] Do not require space after , in smiley pak files (Bug #13647)</li> <li>[Fix] Properly display the subscribe link in topic and forum display for Oracle (Bug #13583)</li> + <li>[Change] Add version number to ACP index (Bug #13703)</li> + <li>[Fix] Quick-Mod tools now retaining the start parameter (Bug #13537)</li> </ul> diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 770c82552f..0de214af7e 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -375,6 +375,7 @@ class acp_main 'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true, 'GZIP_COMPRESSION' => ($config['gzip_compress']) ? $user->lang['ON'] : $user->lang['OFF'], 'DATABASE_INFO' => $db->sql_server_info(), + 'BOARD_VERSION' => $config['version'], 'U_ACTION' => append_sid("{$phpbb_admin_path}index.$phpEx"), 'U_ADMIN_LOG' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&mode=admin'), diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 7c5e39c3a7..516a4570b8 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -994,7 +994,7 @@ class custom_profile_admin extends custom_profile ); $options = array( - 0 => array('TITLE' => $user->lang['FIELD_TYPE'], 'EXPLAIN' => $user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($this->vars['field_length'] == 1) ? ' checked="checked"' : '') . ' />' . $user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($this->vars['field_length'] == 2) ? ' checked="checked"' : '') . ' />' . $user->lang['CHECKBOX'] . '</label>'), + 0 => array('TITLE' => $user->lang['FIELD_TYPE'], 'EXPLAIN' => $user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => '<label><input type="radio" class="radio" name="field_length" value="1"' . (($this->vars['field_length'] == 1) ? ' checked="checked"' : '') . ' /> ' . $user->lang['RADIO_BUTTONS'] . '</label><label><input type="radio" class="radio" name="field_length" value="2"' . (($this->vars['field_length'] == 2) ? ' checked="checked"' : '') . ' /> ' . $user->lang['CHECKBOX'] . '</label>'), 1 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row)) ); diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 3923da2b00..576b87eabd 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -296,6 +296,7 @@ $lang = array_merge($lang, array( 'AVATAR_DIR_SIZE' => 'Avatar directory size', 'BOARD_STARTED' => 'Board started', + 'BOARD_VERSION' => 'Board version', 'DATABASE_SERVER_INFO' => 'Database server', 'DATABASE_SIZE' => 'Database size', diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 24e7b732f2..80c287da34 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -62,7 +62,7 @@ $lang = array_merge($lang, array( 'DISPLAY_AT_REGISTER' => 'Display at registration screen', 'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration and able to be changed within the user control panel.', 'DISPLAY_PROFILE_FIELD' => 'Display profile field', - 'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown on topic pages, profiles and the memberlist if this is enabled within the load settings. Only showing within the users profile is enabled by default.', + 'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown in all places allowed within the load settings. Setting this to “no” will hide the field from topic pages, profiles and the memberlist.', 'DROPDOWN_ENTRIES_EXPLAIN' => 'Enter your options now, every option in one line.', 'EDIT_DROPDOWN_LANG_EXPLAIN' => 'Please note that you are able to change your options text and also able to add new options to the end. It is not advised to add new options between existing options - this could result in wrong options assigned to your users. This can also happen if you remove options in-between. Removing options from the end result in users having assigned this item now reverting back to the default one.', diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 7d07b227fb..2bf9d2090e 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -563,7 +563,7 @@ $template->assign_vars(array( 'S_SINGLE_MODERATOR' => (!empty($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id]) > 1) ? false : true, 'S_TOPIC_ACTION' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"), 'S_TOPIC_MOD' => ($topic_mod != '') ? '<select name="action">' . $topic_mod . '</select>' : '', - 'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "t=$topic_id&f=$forum_id&quickmod=1&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url)), true, $user->session_id), + 'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&t=$topic_id&start=$start&quickmod=1&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url)), true, $user->session_id), 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 't=' . $topic_id), |