diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-04-02 09:51:37 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-04-02 09:51:37 +0200 |
| commit | 2653b98e09fad62c6e9af83a7f6938bc43833870 (patch) | |
| tree | 9702d9643d1961938fed3b4785cbc450e79848bf /phpBB/includes/acp | |
| parent | f9b60863025b02f49261515f952e99dd23f25bb6 (diff) | |
| parent | 5b61ac06cbb065d0e5d6c0c108ead96cea0c3333 (diff) | |
| download | forums-2653b98e09fad62c6e9af83a7f6938bc43833870.tar forums-2653b98e09fad62c6e9af83a7f6938bc43833870.tar.gz forums-2653b98e09fad62c6e9af83a7f6938bc43833870.tar.bz2 forums-2653b98e09fad62c6e9af83a7f6938bc43833870.tar.xz forums-2653b98e09fad62c6e9af83a7f6938bc43833870.zip | |
Merge branch 'ticket/14577' into ticket/14577-3.2.x
Conflicts:
phpBB/includes/acp/acp_modules.php
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index ab413bf1d7..07ec6713a0 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -1431,7 +1431,7 @@ class acp_attachments $row['group_name'] = $user->lang['NOT_ASSIGNED']; $group_name[] = $row; - for ($i = 0; $i < sizeof($group_name); $i++) + for ($i = 0, $groups_size = sizeof($group_name); $i < $groups_size; $i++) { if ($default_group === false) { diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index c5d2d0ea09..3ea9d81887 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -1420,7 +1420,7 @@ class acp_forums $diff = sizeof($moved_forums) * 2; $moved_ids = array(); - for ($i = 0; $i < sizeof($moved_forums); ++$i) + for ($i = 0, $size = sizeof($moved_forums); $i < $size; ++$i) { $moved_ids[] = $moved_forums[$i]['forum_id']; } |