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 2021-10-03 17:34:31 +02:00
commit f94eec5e0d
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,7 +140,6 @@
<td class="tabled"><strong>{{ PHP_VERSION_INFO }}</strong></td> <td class="tabled"><strong>{{ PHP_VERSION_INFO }}</strong></td>
</tr> </tr>
<tr> <tr>
{% if S_TOTAL_ORPHAN %}
<td class="tabled">{{ lang('NUMBER_ORPHAN') ~ lang('COLON') }}</td> <td class="tabled">{{ lang('NUMBER_ORPHAN') ~ lang('COLON') }}</td>
<td class="tabled"> <td class="tabled">
{% if TOTAL_ORPHAN > 0 %} {% if TOTAL_ORPHAN > 0 %}
@ -149,8 +148,6 @@
<strong>{{ TOTAL_ORPHAN }}</strong> <strong>{{ TOTAL_ORPHAN }}</strong>
{% endif %} {% endif %}
</td> </td>
{% else %}
{% endif %}
</tr> </tr>
{% if S_VERSIONCHECK %} {% if S_VERSIONCHECK %}
<tr> <tr>
@ -204,10 +201,12 @@
<td class="tabled">{{ lang('FILES_PER_DAY') ~ lang('COLON') }}</td> <td class="tabled">{{ lang('FILES_PER_DAY') ~ lang('COLON') }}</td>
<td class="tabled"><strong>{{ FILES_PER_DAY }}</strong></td> <td class="tabled"><strong>{{ FILES_PER_DAY }}</strong></td>
</tr> </tr>
{% if S_VERSIONCHECK %}
<tr> <tr>
<td class="tabled">&nbsp;</td> <td class="tabled">&nbsp;</td>
<td class="tabled">&nbsp;</td> <td class="tabled">&nbsp;</td>
</tr> </tr>
{% endif %}
</tbody> </tbody>
</table> </table>
</div> </div>

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

@ -533,8 +533,6 @@ class acp_main
$files_per_day = $total_files; $files_per_day = $total_files;
} }
if ($config['allow_attachments'] || $config['allow_pm_attach'])
{
$sql = 'SELECT COUNT(attach_id) AS total_orphan $sql = 'SELECT COUNT(attach_id) AS total_orphan
FROM ' . ATTACHMENTS_TABLE . ' FROM ' . ATTACHMENTS_TABLE . '
WHERE is_orphan = 1 WHERE is_orphan = 1
@ -542,11 +540,6 @@ class acp_main
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$total_orphan = (int) $db->sql_fetchfield('total_orphan'); $total_orphan = (int) $db->sql_fetchfield('total_orphan');
$db->sql_freeresult($result); $db->sql_freeresult($result);
}
else
{
$total_orphan = false;
}
$dbsize = get_database_size(); $dbsize = get_database_size();
@ -564,7 +557,6 @@ class acp_main
'DBSIZE' => $dbsize, 'DBSIZE' => $dbsize,
'UPLOAD_DIR_SIZE' => $upload_dir_size, 'UPLOAD_DIR_SIZE' => $upload_dir_size,
'TOTAL_ORPHAN' => $total_orphan, 'TOTAL_ORPHAN' => $total_orphan,
'S_TOTAL_ORPHAN' => ($total_orphan === false) ? false : true,
'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'], 'GZIP_COMPRESSION' => ($config['gzip_compress'] && @extension_loaded('zlib')) ? $user->lang['ON'] : $user->lang['OFF'],
'DATABASE_INFO' => $db->sql_server_info(), 'DATABASE_INFO' => $db->sql_server_info(),
'PHP_VERSION_INFO' => PHP_VERSION, 'PHP_VERSION_INFO' => PHP_VERSION,