aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-04-22 19:58:15 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-04-22 19:58:15 +0200
commit5b6a6753992ae03e7bd36e7530a1a4e0e14fb57b (patch)
treeb7b9e07fe6dec4a63b3c53e33338430531a13a40 /phpBB/includes
parent121bd90873c4b7f4333480718e866edc51a84d16 (diff)
parenta9fbc34cf43ef1b70ba5930ca08d355cad4c982b (diff)
downloadforums-5b6a6753992ae03e7bd36e7530a1a4e0e14fb57b.tar
forums-5b6a6753992ae03e7bd36e7530a1a4e0e14fb57b.tar.gz
forums-5b6a6753992ae03e7bd36e7530a1a4e0e14fb57b.tar.bz2
forums-5b6a6753992ae03e7bd36e7530a1a4e0e14fb57b.tar.xz
forums-5b6a6753992ae03e7bd36e7530a1a4e0e14fb57b.zip
Merge pull request #2036 from prototech/ticket/12201
[ticket/12201] Clean up ACP attachment management page * prototech/ticket/12201: [ticket/12201] Decreased pagination font size. [ticket/12201] Update select element to follow same design as prosilver. [ticket/12201] Increase sort font size just slightly. [ticket/12201] Add link to resync file stats after error. [ticket/12201] Fix typos in language pack. [ticket/12201] Display error and sorting options when there are no attachments [ticket/12201] Only the top pagination should be floated to the right. [ticket/12201] Rearrange pagination, sorting, and submit elements. [ticket/12201] Center the file size and mark columns. [ticket/12201] Separate pagination from table.
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_attachments.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index f68fd76587..d8d382b2bd 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1115,11 +1115,6 @@ class acp_attachments
if ($stats_error)
{
$error[] = $stats_error;
-
- // Show option to resync stats
- $this->template->assign_vars(array(
- 'S_ACTION_OPTIONS' => $auth->acl_get('a_board'),
- ));
}
$template->assign_vars(array(
@@ -1321,7 +1316,15 @@ class acp_attachments
if (($num_files != $stats['num_files']) || ($total_size != $stats['upload_dir_size']))
{
- return $this->user->lang('FILES_STATS_WRONG', (int) $stats['num_files'], get_formatted_filesize($stats['upload_dir_size']));
+ $u_resync = $this->u_action . '&amp;action=stats';
+
+ return $this->user->lang(
+ 'FILES_STATS_WRONG',
+ (int) $stats['num_files'],
+ get_formatted_filesize($stats['upload_dir_size']),
+ '<a href="' . $u_resync . '">',
+ '</a>'
+ );
}
return false;
}