diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 00:42:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-17 00:42:40 +0200 |
| commit | c9da435d3c952db59e8d0a3198ef23f48789672f (patch) | |
| tree | 9a85d547b64bcc61cc0417469f3b026d43885d9f /phpBB/includes/mcp | |
| parent | 7f5aeeef012dcd9b5492e7eaebbbb3e56b5a3d00 (diff) | |
| parent | 89af1150718a184249d8040637969b03a3003596 (diff) | |
| download | forums-c9da435d3c952db59e8d0a3198ef23f48789672f.tar forums-c9da435d3c952db59e8d0a3198ef23f48789672f.tar.gz forums-c9da435d3c952db59e8d0a3198ef23f48789672f.tar.bz2 forums-c9da435d3c952db59e8d0a3198ef23f48789672f.tar.xz forums-c9da435d3c952db59e8d0a3198ef23f48789672f.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12721] Update rules descriptions
[ticket/12721] Add Generic.NamingConventions.ConstructorName in strict
[ticket/12721] Add Squiz.Functions.LowercaseFunctionKeywords in legacy
[ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
[ticket/12721] Add Squiz.ControlStructures.ForEachLoopDeclaration
[ticket/12721] Add Squiz.ControlStructures.ElseIfDeclaration in legacy
[ticket/12721] Add Generic.Functions.OpeningFunctionBraceBsdAllman
[ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy ruleset
[ticket/12721] Add Generic.Files.LowercasedFilename in the legacy ruleset
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_reports.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 9a2b4d2a4e..84097327bd 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -496,11 +496,11 @@ function mcp_move_topic($topic_ids) { $topics_moved++; } - elseif ($topic_info['topic_visibility'] == ITEM_UNAPPROVED || $topic_info['topic_visibility'] == ITEM_REAPPROVE) + else if ($topic_info['topic_visibility'] == ITEM_UNAPPROVED || $topic_info['topic_visibility'] == ITEM_REAPPROVE) { $topics_moved_unapproved++; } - elseif ($topic_info['topic_visibility'] == ITEM_DELETED) + else if ($topic_info['topic_visibility'] == ITEM_DELETED) { $topics_moved_softdeleted++; } diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index f045fd018f..b0148356ce 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -489,7 +489,7 @@ function close_report($report_id_list, $mode, $action, $pm = false) { $redirect = request_var('redirect', build_url(array('mode', 'r', 'quickmod')) . '&mode=reports'); } - elseif ($action == 'delete' && strpos($user->data['session_page'], 'mode=pm_report_details') !== false) + else if ($action == 'delete' && strpos($user->data['session_page'], 'mode=pm_report_details') !== false) { $redirect = request_var('redirect', build_url(array('mode', 'r', 'quickmod')) . '&mode=pm_reports'); } |