diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-22 23:15:26 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-22 23:15:26 +0100 |
| commit | 7c77e333138e6c705ffbfd3028ce1d2002404965 (patch) | |
| tree | c0fa7de1eac82faa1cd758fe6ed92920570d311a /phpBB/adm | |
| parent | f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961 (diff) | |
| parent | 085a839963b61e9812aa06601b1ffeb2eb077ab9 (diff) | |
| download | forums-7c77e333138e6c705ffbfd3028ce1d2002404965.tar forums-7c77e333138e6c705ffbfd3028ce1d2002404965.tar.gz forums-7c77e333138e6c705ffbfd3028ce1d2002404965.tar.bz2 forums-7c77e333138e6c705ffbfd3028ce1d2002404965.tar.xz forums-7c77e333138e6c705ffbfd3028ce1d2002404965.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[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')
| -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> |