diff options
| author | Richard McGirr <rmcgirr83@gmail.com> | 2016-04-05 06:57:32 -0400 |
|---|---|---|
| committer | Richard McGirr <rmcgirr83@gmail.com> | 2016-04-05 07:09:12 -0400 |
| commit | 04f320cb011f386d11672547c17965a7bd16ef35 (patch) | |
| tree | d233fa57ab885bcf6b236fde47c4bd6d304939b2 /phpBB/adm/style/acp_update.html | |
| parent | d0f5b39f117376a037bdeabc91f32c1d5436d99b (diff) | |
| download | forums-04f320cb011f386d11672547c17965a7bd16ef35.tar forums-04f320cb011f386d11672547c17965a7bd16ef35.tar.gz forums-04f320cb011f386d11672547c17965a7bd16ef35.tar.bz2 forums-04f320cb011f386d11672547c17965a7bd16ef35.tar.xz forums-04f320cb011f386d11672547c17965a7bd16ef35.zip | |
[ticket/13716] Check phpBB version against config version
Display a warning in the ACP if the version constant (files)
does not match the phpbb_config version
(often indicating that the database updates hasn't been run)
PHPBB3-13716
Diffstat (limited to 'phpBB/adm/style/acp_update.html')
| -rw-r--r-- | phpBB/adm/style/acp_update.html | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index 0cc995959b..68cce6265f 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -6,11 +6,16 @@ <p>{L_VERSION_CHECK_EXPLAIN}</p> +<!-- IF S_UPDATE_INCOMPLETE --> + <div class="errorbox"> + <p>{L_UPDATE_INCOMPLETE} {L_UPDATE_INCOMPLETE_MORE}</p> + </div> +<!-- ENDIF --> <!-- IF S_UP_TO_DATE --> <div class="successbox"> <p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> </div> -<!-- ELSE --> +<!-- ELSEIF not S_UPDATE_INCOMPLETE --> <div class="errorbox"> <p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> </div> @@ -18,10 +23,21 @@ <fieldset> <legend></legend> + <!-- IF not S_UPDATE_INCOMPLETE --> <dl> <dt><label>{L_CURRENT_VERSION}</label></dt> <dd><strong>{CURRENT_VERSION}</strong></dd> </dl> + <!-- ELSE --> + <dl> + <dt><label>{L_FILES_VERSION}</label></dt> + <dd><strong>{FILES_VERSION}</strong></dd> + </dl> + <dl> + <dt><label>{L_DATABASE_VERSION}</label></dt> + <dd><strong>{CURRENT_VERSION}</strong></dd> + </dl> + <!-- ENDIF --> </fieldset> <!-- BEGIN updates_available --> @@ -38,6 +54,11 @@ </fieldset> <!-- END updates_available --> +<!-- IF S_UPDATE_INCOMPLETE --> + {INCOMPLETE_INSTRUCTIONS} + <br><br> +<!-- ENDIF --> + <!-- IF not S_UP_TO_DATE --> {UPDATE_INSTRUCTIONS} <br /><br /> |