diff options
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 47 |
2 files changed, 33 insertions, 21 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 2ff597ee98..cc56aba369 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -125,7 +125,6 @@ class acp_forums 'type_action' => request_var('type_action', ''), 'forum_status' => request_var('forum_status', ITEM_UNLOCKED), 'forum_parents' => '', - 'forum_options' => 0, 'forum_name' => utf8_normalize_nfc(request_var('forum_name', '', true)), 'forum_link' => request_var('forum_link', ''), 'forum_link_track' => request_var('forum_link_track', false), @@ -159,6 +158,12 @@ class acp_forums 'forum_password_unset' => request_var('forum_password_unset', false), ); + // On add, add empty forum_options... else do not consider it (not updating it) + if ($action == 'add') + { + $forum_data['forum_options'] = 0; + } + // Use link_display_on_index setting if forum type is link if ($forum_data['forum_type'] == FORUM_LINK) { diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 8213c55ccb..e1deb7e533 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -89,16 +89,19 @@ class acp_icons continue; } - // adjust the width and height to be lower than 128px while perserving the aspect ratio - if ($img_size[0] > 127 && $img_size[0] > $img_size[1]) + // adjust the width and height to be lower than 128px while perserving the aspect ratio (for icons) + if ($mode == 'icons') { - $img_size[1] = (int) ($img_size[1] * (127 / $img_size[0])); - $img_size[0] = 127; - } - else if ($img_size[1] > 127) - { - $img_size[0] = (int) ($img_size[0] * (127 / $img_size[1])); - $img_size[1] = 127; + if ($img_size[0] > 127 && $img_size[0] > $img_size[1]) + { + $img_size[1] = (int) ($img_size[1] * (127 / $img_size[0])); + $img_size[0] = 127; + } + else if ($img_size[1] > 127) + { + $img_size[0] = (int) ($img_size[0] * (127 / $img_size[1])); + $img_size[1] = 127; + } } $_images[$path . $img]['file'] = $path . $img; @@ -363,7 +366,7 @@ class acp_icons if ($mode == 'smilies' && $action == 'create') { $smiley_count = $this->item_count($table); - + $addable_smileys_count = sizeof($images); foreach ($images as $image) { @@ -372,7 +375,7 @@ class acp_icons --$addable_smileys_count; } } - + if ($smiley_count + $addable_smileys_count > SMILEY_LIMIT) { trigger_error(sprintf($user->lang['TOO_MANY_SMILIES'], SMILEY_LIMIT) . adm_back_link($this->u_action), E_USER_WARNING); @@ -400,15 +403,19 @@ class acp_icons $image_height[$image] = $img_size[1]; } - if ($image_width[$image] > 127 && $image_width[$image] > $image_height[$image]) + // Adjust image width/height for icons + if ($mode == 'icons') { - $image_height[$image] = (int) ($image_height[$image] * (127 / $image_width[$image])); - $image_width[$image] = 127; - } - else if ($image_height[$image] > 127) - { - $image_width[$image] = (int) ($image_width[$image] * (127 / $image_height[$image])); - $image_height[$image] = 127; + if ($image_width[$image] > 127 && $image_width[$image] > $image_height[$image]) + { + $image_height[$image] = (int) ($image_height[$image] * (127 / $image_width[$image])); + $image_width[$image] = 127; + } + else if ($image_height[$image] > 127) + { + $image_width[$image] = (int) ($image_width[$image] * (127 / $image_height[$image])); + $image_height[$image] = 127; + } } $img_sql = array( @@ -923,7 +930,7 @@ class acp_icons generate_pagination($this->u_action, $item_count, $config['smilies_per_page'], $pagination_start, true) ); } - + /** * Returns the count of smilies or icons in the database * |