summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/models/item.php14
-rw-r--r--themes/admin_default/views/admin.html.php4
2 files changed, 9 insertions, 9 deletions
diff --git a/core/models/item.php b/core/models/item.php
index bd2d3024..2d254a49 100644
--- a/core/models/item.php
+++ b/core/models/item.php
@@ -344,13 +344,13 @@ class Item_Model extends ORM_MPTT {
if ($height) {
if (isset($max)) {
- if ($width > $height) {
- $height = (int)($max * ($height / $width));
- $width = $max;
- } else {
- $width = (int)($max * ($width / $height));
- $height = $max;
- }
+ if ($width > $height) {
+ $height = (int)($max * ($height / $width));
+ $width = $max;
+ } else {
+ $width = (int)($max * ($width / $height));
+ $height = $max;
+ }
}
} else {
// Missing thumbnail, can happen on albums with no photos yet.
diff --git a/themes/admin_default/views/admin.html.php b/themes/admin_default/views/admin.html.php
index 55f0f884..062c55c9 100644
--- a/themes/admin_default/views/admin.html.php
+++ b/themes/admin_default/views/admin.html.php
@@ -68,8 +68,8 @@
<div id="gFooter">
<?= $theme->admin_footer() ?>
<div>
- <?= $theme->admin_credits() ?>
- </div>
+ <?= $theme->admin_credits() ?>
+ </div>
</div>
</div>
<?= $theme->admin_page_bottom() ?>