diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-09-28 20:39:05 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-09-28 20:39:05 +0000 |
| commit | 47456c0de8a408bca9b5a02a0fbc835ff1c01a68 (patch) | |
| tree | dca2ead5e7159b28aa323465a363f81813f75acd /themes | |
| parent | d8dffba94277c2179a59eb72d6927a5bdb879648 (diff) | |
| parent | dfbfe090168ee4ed44e2c8208e79d3fe40f90437 (diff) | |
Manually fixed a merge conflict after pulling.
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/wind/views/page.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php index 534b7de4..ca6d2bb1 100644 --- a/themes/wind/views/page.html.php +++ b/themes/wind/views/page.html.php @@ -24,7 +24,7 @@ <link rel="apple-touch-icon-precomposed" href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" /> <? if ($theme->page_type == "collection"): ?> - <? if ($thumb_proportion != 1): ?> + <? if (($thumb_proportion = $theme->thumb_proportion($theme->item())) != 1): ?> <? $new_width = round($thumb_proportion * 213) ?> <? $new_height = round($thumb_proportion * 240) ?> <style type="text/css"> |