diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:45 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-24 01:24:45 -0400 |
| commit | 10d963a94e6be18c988d38bba7c235e260b6c8a5 (patch) | |
| tree | ed36ae9f08fb621a8c3b1da1a66a1e5e63750252 /phpBB/includes/mcp/mcp_pm_reports.php | |
| parent | 5bf8ac475bee6cbfcbbe12bf86a6ce5a65640886 (diff) | |
| parent | 41becd9c92672b2d77777b8487df5dbb66851342 (diff) | |
| download | forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.gz forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.bz2 forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.tar.xz forums-10d963a94e6be18c988d38bba7c235e260b6c8a5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12612] Prefix check_ids() with phpbb_
[ticket/12612] Prefix mcp_sorting() with phpbb_
[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global
[ticket/12612] Prefix module url functions with phpbb_
[ticket/12612] Prefix upload_popup() with phpbb_
[ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global
[ticket/12612] Prefix custom UCP module function with phpbb_
[ticket/12612] Prefix _sort_last_active() with phpbb_
[ticket/12612] Prefix show_profile() with phpbb and delete unused global
Diffstat (limited to 'phpBB/includes/mcp/mcp_pm_reports.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_pm_reports.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index 7e39c157c1..03e4ed4722 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -100,7 +100,7 @@ class mcp_pm_reports $pm_id = $report['pm_id']; $report_id = $report['report_id']; - $pm_info = get_pm_data(array($pm_id)); + $pm_info = phpbb_get_pm_data(array($pm_id)); if (!sizeof($pm_info)) { @@ -216,7 +216,7 @@ class mcp_pm_reports $sort_days = $total = 0; $sort_key = $sort_dir = ''; $sort_by_sql = $sort_order_sql = array(); - mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total); + phpbb_mcp_sorting($mode, $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total); $limit_time_sql = ($sort_days) ? 'AND r.report_time >= ' . (time() - ($sort_days * 86400)) : ''; |