diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/database_update.php | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/posting_poll_body.html | 21 |
2 files changed, 11 insertions, 16 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4746bb11f2..e6f360d418 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -184,9 +184,9 @@ define('IN_DB_UPDATE', true); /* @var $migrator \phpbb\db\migrator */ $migrator = $phpbb_container->get('migrator'); -/** @var \phpbb\filesystem\filesystem_interface $filesystem */ -$filesystem = $phpbb_container->get('filesystem'); -$migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($user, new \phpbb\db\html_migrator_output_handler($user), $phpbb_root_path . 'store/migrations_' . time() . '.log', $filesystem)); +/** @var \phpbb\filesystem\filesystem_interface $phpbb_filesystem */ +$phpbb_filesystem = $phpbb_container->get('filesystem'); +$migrator->set_output_handler(new \phpbb\db\log_wrapper_migrator_output_handler($user, new \phpbb\db\html_migrator_output_handler($user), $phpbb_root_path . 'store/migrations_' . time() . '.log', $phpbb_filesystem)); $migrator->create_migrations_table(); diff --git a/phpBB/styles/prosilver/template/posting_poll_body.html b/phpBB/styles/prosilver/template/posting_poll_body.html index c3eea0d21d..dcaec14a93 100644 --- a/phpBB/styles/prosilver/template/posting_poll_body.html +++ b/phpBB/styles/prosilver/template/posting_poll_body.html @@ -6,13 +6,14 @@ <!-- ENDIF --> <fieldset class="fields2"> + <!-- IF S_POLL_DELETE --> + <dl> + <dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt> + <dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd> + </dl> + <!-- ENDIF --> + <!-- IF S_SHOW_POLL_BOX --> - <!-- IF S_POLL_DELETE --> - <dl> - <dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt> - <dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd> - </dl> - <!-- ENDIF --> <dl> <dt><label for="poll_title">{L_POLL_QUESTION}{L_COLON}</label></dt> <dd><input type="text" name="poll_title" id="poll_title" maxlength="255" value="{POLL_TITLE}" class="inputbox" /></dd> @@ -44,14 +45,8 @@ </dl> <!-- ENDIF --> <!-- ENDIF --> - <!-- EVENT posting_poll_body_options_after --> - <!-- IF S_POLL_DELETE --> - <dl class="fields1"> - <dt><label for="poll_delete">{L_POLL_DELETE}{L_COLON}</label></dt> - <dd><label for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /> </label></dd> - </dl> - <!-- ENDIF --> + <!-- EVENT posting_poll_body_options_after --> </fieldset> </div> |