mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:22:37 +02:00
Code Issues Releases Wiki Activity

[ticket/11162] Rename tricky updates to database helper.

Browse Source 
PHPBB3-11162
This commit is contained in:
Oleg Pudeyev
2012-12-12 21:46:38 -05:00
parent f5de11438c
commit e2c67a8e42
7 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
phpBB/includes/functions_tricky_update.php → phpBB/includes/functions_database_helper.php
View File

2
phpBB/includes/mcp/mcp_forum.php
View File

@@ -417,7 +417,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id)
// Update the topic watch table. // Update the topic watch table.
if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status')) if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
{ {
include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx); include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx);
} }
phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id); phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);

2
phpBB/includes/mcp/mcp_topic.php
View File

@@ -622,7 +622,7 @@ function merge_posts($topic_id, $to_topic_id)
// If the topic no longer exist, we will update the topic watch table. // If the topic no longer exist, we will update the topic watch table.
if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status')) if (!function_exists('phpbb_update_rows_avoiding_duplicates_notify_status'))
{ {
include($phpbb_root_path . 'includes/functions_tricky_update.' . $phpEx); include($phpbb_root_path . 'includes/functions_database_helper.' . $phpEx);
} }
phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id); phpbb_update_rows_avoiding_duplicates_notify_status($db, TOPICS_WATCH_TABLE, 'topic_id', $topic_ids, $to_topic_id);
} }

0
tests/functions_tricky_update/fixtures/bookmarks_duplicates.xml → tests/functions_database_helper/fixtures/bookmarks_duplicates.xml
View File

0
tests/functions_tricky_update/fixtures/topics_watch_duplicates.xml → tests/functions_database_helper/fixtures/topics_watch_duplicates.xml
View File

2
tests/functions_tricky_update/update_rows_avoiding_duplicates_notify_status_test.php → tests/functions_database_helper/update_rows_avoiding_duplicates_notify_status_test.php
View File

@@ -7,7 +7,7 @@
* *
*/ */
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_tricky_update.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions_database_helper.php';
class phpbb_update_rows_avoiding_duplicates_notify_status_test extends phpbb_database_test_case class phpbb_update_rows_avoiding_duplicates_notify_status_test extends phpbb_database_test_case
{ {

2
tests/functions_tricky_update/update_rows_avoiding_duplicates_test.php → tests/functions_database_helper/update_rows_avoiding_duplicates_test.php
View File

@@ -7,7 +7,7 @@
* *
*/ */
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_tricky_update.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions_database_helper.php';
class phpbb_update_rows_avoiding_duplicates_test extends phpbb_database_test_case class phpbb_update_rows_avoiding_duplicates_test extends phpbb_database_test_case
{ {