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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2024-05-31 09:52:17 +02:00
commit 463dbd59ec
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
phpBB/adm/style/acp_main.html
View file

@ -14,27 +14,31 @@
<p>{L_ADMIN_INTRO}</p> <p>{L_ADMIN_INTRO}</p>
<!-- IF S_UPDATE_INCOMPLETE --> {% if S_UPDATE_INCOMPLETE %}
<div class="errorbox"> <div class="errorbox">
<p>{L_UPDATE_INCOMPLETE} <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p> <p>{{ lang('UPDATE_INCOMPLETE') }} <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
</div> </div>
<!-- ELSEIF S_VERSIONCHECK_FAIL --> {% elseif S_VERSIONCHECK_FAIL %}
<div class="errorbox notice"> <div class="errorbox notice">
<p>{L_VERSIONCHECK_FAIL}</p> <p>{{ lang('VERSIONCHECK_FAIL') }}</p>
<p>{VERSIONCHECK_FAIL_REASON}</p> <p>{{ VERSIONCHECK_FAIL_REASON }}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p> <p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
</div> </div>
<!-- ELSEIF not S_VERSION_UP_TO_DATE --> {% elseif not S_VERSION_UP_TO_DATE %}
<div class="errorbox"> <div class="errorbox">
<p>{L_VERSION_NOT_UP_TO_DATE_TITLE}</p> <p>{{ lang('VERSION_NOT_UP_TO_DATE_TITLE') }}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p> <p><a href="{{ U_VERSIONCHECK_FORCE }}">{{ lang('VERSIONCHECK_FORCE_UPDATE') }}</a> &middot; <a href="{{ U_VERSIONCHECK }}">{{ lang('MORE_INFORMATION') }}</a></p>
</div> </div>
<!-- ENDIF --> {% elseif S_VERSION_UP_TO_DATE && S_VERSIONCHECK_FORCE %}
<!-- IF S_VERSION_UPGRADEABLE --> <div class="successbox">
<p>{{ lang('VERSION_UP_TO_DATE_ACP') }}</p>
</div>
{% endif %}
{% if S_VERSION_UPGRADEABLE %}
<div class="errorbox notice"> <div class="errorbox notice">
<p>{UPGRADE_INSTRUCTIONS}</p> <p>{{ UPGRADE_INSTRUCTIONS }}</p>
</div> </div>
<!-- ENDIF --> {% endif %}
{% if S_CAPTCHA_UNSAFE %} {% if S_CAPTCHA_UNSAFE %}
<div class="errorbox"> <div class="errorbox">
<p>{{ lang('CAPTCHA_UNSAFE_WARNING') }}</p> <p>{{ lang('CAPTCHA_UNSAFE_WARNING') }}</p>

1
phpBB/includes/acp/acp_main.php
View file

@ -445,6 +445,7 @@ class acp_main
$template->assign_vars(array( $template->assign_vars(array(
'S_VERSION_UP_TO_DATE' => empty($updates_available), 'S_VERSION_UP_TO_DATE' => empty($updates_available),
'S_VERSION_UPGRADEABLE' => !empty($upgrades_available), 'S_VERSION_UPGRADEABLE' => !empty($upgrades_available),
'S_VERSIONCHECK_FORCE' => (bool) $recheck,
'UPGRADE_INSTRUCTIONS' => !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false, 'UPGRADE_INSTRUCTIONS' => !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false,
)); ));
} }