diff options
| author | David King <imkingdavid@gmail.com> | 2012-02-03 16:58:50 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-02-03 16:58:50 -0500 |
| commit | 508b06063fe087bb484c360b03c65637a19e31a7 (patch) | |
| tree | cf13c2f36f845f405d534c6f6795b4b1155191cc | |
| parent | 2ae6b8a5eda3425c1798c11d3b663205eaf2f07e (diff) | |
| parent | 225892f506e0a109e710534fee64a11614921d88 (diff) | |
| download | forums-508b06063fe087bb484c360b03c65637a19e31a7.tar forums-508b06063fe087bb484c360b03c65637a19e31a7.tar.gz forums-508b06063fe087bb484c360b03c65637a19e31a7.tar.bz2 forums-508b06063fe087bb484c360b03c65637a19e31a7.tar.xz forums-508b06063fe087bb484c360b03c65637a19e31a7.zip | |
Merge remote-tracking branch 'unknownbliss/ticket/9914' into develop-olympus
* unknownbliss/ticket/9914:
[ticket/9914] Add backup warning to updater.
| -rw-r--r-- | phpBB/adm/style/install_update.html | 5 | ||||
| -rw-r--r-- | phpBB/language/en/install.php | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 22d21d8314..818889c89b 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -43,6 +43,11 @@ <p>{WARNING_MSG}</p> </div> <!-- ENDIF --> + + <div class="errorbox" style="margin-top: 0;"> + <h3>{L_NOTICE}</h3> + <p>{L_BACKUP_NOTICE}</p> + </div> <form id="install_update" method="post" action="{U_ACTION}"> diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index f69ca40613..bbf407f1dc 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -52,6 +52,7 @@ $lang = array_merge($lang, array( 'BLANK_PREFIX_FOUND' => 'A scan of your tables has shown a valid installation using no table prefix.', 'BOARD_NOT_INSTALLED' => 'No installation found', 'BOARD_NOT_INSTALLED_EXPLAIN' => 'The phpBB Unified Convertor Framework requires a default installation of phpBB3 to function, please <a href="%s">proceed by first installing phpBB3</a>.', + 'BACKUP_NOTICE' => 'Please backup your board before updating in case any problems arise during the update process.', 'CATEGORY' => 'Category', 'CACHE_STORE' => 'Cache type', |