diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-22 23:10:22 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-22 23:10:22 +0100 |
| commit | 085a839963b61e9812aa06601b1ffeb2eb077ab9 (patch) | |
| tree | 0704c11cc4046d2ad235515774b62e2ab9ee8750 /phpBB/adm/style | |
| parent | dcadfe092c16b539121d2118169419ed01a6cc2c (diff) | |
| parent | 38d0f2892e9d8f55c6e6af2d004da9621ee7f8f5 (diff) | |
| download | forums-085a839963b61e9812aa06601b1ffeb2eb077ab9.tar forums-085a839963b61e9812aa06601b1ffeb2eb077ab9.tar.gz forums-085a839963b61e9812aa06601b1ffeb2eb077ab9.tar.bz2 forums-085a839963b61e9812aa06601b1ffeb2eb077ab9.tar.xz forums-085a839963b61e9812aa06601b1ffeb2eb077ab9.zip | |
Merge pull request #4662 from marc1706/ticket/14968
[ticket/14968] Distinguish between update/upgrade & show upgrade info in ACP index
* marc1706/ticket/14968:
[ticket/14968] Use earlier version as written in comment
[ticket/14968] Update docblock and ensure method returns array
[ticket/14968] Display possible upgrade on acp index and update page
[ticket/14968] Add method for retrieving updates on current branch
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_main.html | 5 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_update.html | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index efcb25cb68..1bdb7b8d2a 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -30,6 +30,11 @@ <p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> · <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p> </div> <!-- ENDIF --> + <!-- IF S_VERSION_UPGRADEABLE --> + <div class="errorbox notice"> + <p>{UPGRADE_INSTRUCTIONS}</p> + </div> + <!-- ENDIF --> <!-- IF S_SEARCH_INDEX_MISSING --> <div class="errorbox"> diff --git a/phpBB/adm/style/acp_update.html b/phpBB/adm/style/acp_update.html index 351a3ba26c..5288833d05 100644 --- a/phpBB/adm/style/acp_update.html +++ b/phpBB/adm/style/acp_update.html @@ -20,6 +20,11 @@ <p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> </div> <!-- ENDIF --> +<!-- IF S_VERSION_UPGRADEABLE --> + <div class="errorbox notice"> + <p>{UPGRADE_INSTRUCTIONS}</p> + </div> +<!-- ENDIF --> <fieldset> <legend></legend> |