mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

Browse Source 
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
This commit is contained in:
Nathaniel Guse
2012-11-10 10:58:44 -06:00
parent 6c8c54d4d2 f5ed04f8ff
commit 68363e362d
290 changed files with 2456 additions and 1755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/mcp/mcp_pm_reports.php
View File

@@ -300,10 +300,10 @@ class mcp_pm_reports
}
}
}
$base_url = $this->u_action . "&st=$sort_days&sk=$sort_key&sd=$sort_dir";
phpbb_generate_template_pagination($template, $base_url, 'pagination', 'start', $total, $config['topics_per_page'], $start);
// Now display the page
$template->assign_vars(array(
'L_EXPLAIN' => ($mode == 'pm_reports') ? $user->lang['MCP_PM_REPORTS_OPEN_EXPLAIN'] : $user->lang['MCP_PM_REPORTS_CLOSED_EXPLAIN'],