diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:17:33 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-06-19 18:17:33 +0200 |
| commit | c60dbede3ef3e42528b95b9b9b5337473bafda5c (patch) | |
| tree | b190d35264ffc324c359e37b9207a12374c138c5 /phpBB/adm | |
| parent | aaa99b471913e40ef5a31c12cba70d9fbb653de6 (diff) | |
| parent | 0d7625c534b87b5d27977c2baa5e5ada132f7280 (diff) | |
| download | forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.tar forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.tar.gz forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.tar.bz2 forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.tar.xz forums-c60dbede3ef3e42528b95b9b9b5337473bafda5c.zip | |
Merge pull request #4281 from rmcgirr83/ticket_13716
[ticket/13716] Check phpBB version against config version
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 6 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_update.html | 23 |
2 files changed, 27 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 4af3f1a62c..efcb25cb68 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,7 +14,11 @@ <p>{L_ADMIN_INTRO}</p> - <!-- IF S_VERSIONCHECK_FAIL --> + <!-- IF S_UPDATE_INCOMPLETE --> + <div class="errorbox"> + <p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p> + </div> + <!-- ELSEIF S_VERSIONCHECK_FAIL --> <div class="errorbox notice"> <p>{L_VERSIONCHECK_FAIL}</p> <p>{VERSIONCHECK_FAIL_REASON}</p> diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index 0cc995959b..351a3ba26c 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> +<!-- ENDIF --> + <!-- IF not S_UP_TO_DATE --> {UPDATE_INSTRUCTIONS} <br /><br /> |