makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source 
* 3.2.x:
  [ticket/14901] Remove notice for extension without version check
This commit is contained in:
Tristan Darricau 2016-12-11 20:09:18 +01:00
commit cb3dd0bce5
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 39 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/adm/style/acp_ext_details.html
View file

@ -7,20 +7,18 @@
<h1>{L_EXTENSIONS_ADMIN}</h1> <h1>{L_EXTENSIONS_ADMIN}</h1>
<!-- IF S_VERSIONCHECK --> <!-- IF S_VERSIONCHECK -->
<div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->"> <!-- IF S_VERSIONCHECK_FAIL -->
<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"> <div class="errorbox notice">
<p>{L_VERSIONCHECK_FAIL}</p> <p>{L_VERSIONCHECK_FAIL}</p>
<p>{VERSIONCHECK_FAIL_REASON}</p> <p>{VERSIONCHECK_FAIL_REASON}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p> <p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
</div> </div>
<!-- ELSE IF S_VERSIONCHECK_STATUS == 1 --> <!-- ELSE -->
<div class="errorbox notice"> <div class="<!-- IF S_UP_TO_DATE -->successbox<!-- ELSE -->errorbox<!-- ENDIF -->">
<p>{VERSIONCHECK_FAIL_REASON}</p> <p>{UP_TO_DATE_MSG} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF -->
<fieldset> <fieldset>
<legend>{L_EXT_DETAILS}</legend> <legend>{L_EXT_DETAILS}</legend>

12
phpBB/includes/acp/acp_extensions.php
View file

@ -308,13 +308,15 @@ class acp_extensions
// Output it to the template // Output it to the template
$md_manager->output_template_data($template); $md_manager->output_template_data($template);
$meta = $md_manager->get_metadata('all');
if (isset($meta['extra']['version-check']))
{
try try
{ {
$updates_available = $phpbb_extension_manager->version_check($md_manager, $request->variable('versioncheck_force', false), $this->config['extension_force_unstable'] ? 'unstable' : null); $updates_available = $phpbb_extension_manager->version_check($md_manager, $request->variable('versioncheck_force', false), $this->config['extension_force_unstable'] ? 'unstable' : null);
$template->assign_vars(array( $template->assign_vars(array(
'S_UP_TO_DATE' => empty($updates_available), 'S_UP_TO_DATE' => empty($updates_available),
'S_VERSIONCHECK' => true,
'UP_TO_DATE_MSG' => $this->user->lang(empty($updates_available) ? 'UP_TO_DATE' : 'NOT_UP_TO_DATE', $md_manager->get_metadata('display-name')), 'UP_TO_DATE_MSG' => $this->user->lang(empty($updates_available) ? 'UP_TO_DATE' : 'NOT_UP_TO_DATE', $md_manager->get_metadata('display-name')),
)); ));
@ -328,10 +330,16 @@ class acp_extensions
$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters()));
$template->assign_vars(array( $template->assign_vars(array(
'S_VERSIONCHECK_STATUS' => $e->getCode(), 'S_VERSIONCHECK_FAIL' => true,
'VERSIONCHECK_FAIL_REASON' => ($e->getMessage() !== 'VERSIONCHECK_FAIL') ? $message : '', 'VERSIONCHECK_FAIL_REASON' => ($e->getMessage() !== 'VERSIONCHECK_FAIL') ? $message : '',
)); ));
} }
$template->assign_var('S_VERSIONCHECK', true);
}
else
{
$template->assign_var('S_VERSIONCHECK', false);
}
$template->assign_vars(array( $template->assign_vars(array(
'U_BACK' => $this->u_action . '&amp;action=list', 'U_BACK' => $this->u_action . '&amp;action=list',