Merge branch 'master' into 3.0.x

gallery · Nov 4, 2011 · a28c169 · a28c169
2 parents 6388094 + 5020f21
commit a28c169
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
@@ -229,7 +229,6 @@ static function find_dirty_images_query() {
     return db::build()
       ->from("items")
       ->and_open()
-      ->and_open()
       ->where("thumb_dirty", "=", 1)
       ->and_open()
       ->where("type", "<>", "album")
@@ -239,8 +238,6 @@ static function find_dirty_images_query() {
       ->where("resize_dirty", "=", 1)
       ->where("type", "=", "photo")
       ->close()
-      ->close()
-      ->where("id", "<>", 1)
       ->close();
   }
 

diff --git 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 = $theme->thumb_proportion($children[0])) != 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">