Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 7 insertions, 0 deletions

diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index 62aa0746..238b18b5 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -72,6 +72,13 @@ class info_block_Core {
             );
           }
         }
+        if (($theme->item->width && $theme->item->height) && module::get_var("info", "show_dimensions")) {
+            $info["size"] = array(
+                "label" => t("Dimensions:"),
+                "value" => t("%width x %height px", array("width" => $theme->item->width, "height" => $theme->item->height))
+            );
+        }
+
         $block->content->metadata = $info;
 
         module::event("info_block_get_metadata", $block, $theme->item);