diff options
author | Tristan Darricau <github@nicofuma.fr> | 2014-05-11 18:41:22 +0200 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-28 22:16:51 +0200 |
commit | bee6c6baeafdf894fd8e30de33e4d94185af5745 (patch) | |
tree | b4fae3c955dbf376a7cb1003b409f75a287ff70e /phpBB | |
parent | 29244c29d1fbc8e086073774a95ffb8ea50761df (diff) | |
download | forums-bee6c6baeafdf894fd8e30de33e4d94185af5745.tar forums-bee6c6baeafdf894fd8e30de33e4d94185af5745.tar.gz forums-bee6c6baeafdf894fd8e30de33e4d94185af5745.tar.bz2 forums-bee6c6baeafdf894fd8e30de33e4d94185af5745.tar.xz forums-bee6c6baeafdf894fd8e30de33e4d94185af5745.zip |
[ticket/11366] Fix detailed view
PHPBB3-11366
Diffstat (limited to 'phpBB')
-rw-r--r-- | phpBB/adm/style/acp_ext_details.html | 11 | ||||
-rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html index 65a9d3c774..830c2e3cb4 100644 --- a/phpBB/adm/style/acp_ext_details.html +++ b/phpBB/adm/style/acp_ext_details.html @@ -6,7 +6,11 @@ <h1>{L_EXTENSIONS_ADMIN}</h1> - <!-- IF S_VERSIONCHECK_STATUS == 0 --> + <!-- IF S_VERSIONCHECK --> + <div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->"> + <p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> + </div> + <!-- ELSE IF S_VERSIONCHECK_STATUS == 0 --> <div class="errorbox notice"> <p>{L_VERSIONCHECK_FAIL}</p> <p>{VERSIONCHECK_FAIL_REASON}</p> @@ -17,11 +21,6 @@ <p>{VERSIONCHECK_FAIL_REASON}</p> </div> <!-- ENDIF --> - <!-- IF S_VERSIONCHECK --> - <div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->"> - <p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> - </div> - <!-- ENDIF --> <fieldset> <legend>{L_EXT_DETAILS}</legend> diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 548aad3df1..2c06050e5c 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -472,10 +472,12 @@ class acp_extensions } /** - * Check the version and return the availables updates. + * Check the version and return the available updates. * * @param \phpbb\extension\metadata_manager $md_manager The metadata manager for the version to check. * @param bool $force Ignores cached data. Default to false. + * @return string + * @throws RuntimeException */ protected function version_check(\phpbb\extension\metadata_manager $md_manager, $force = false) { @@ -492,7 +494,7 @@ class acp_extensions $version_helper->set_current_version($meta['version']); $version_helper->set_file_location($version_check ['host'], $version_check ['directory'], $version_check ['filename']); - return $updates = $version_helper->get_suggested_updates(true); + return $updates = $version_helper->get_suggested_updates($force); } /** |