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

1 files changed, 41 insertions, 0 deletions

diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
index 3cbbb12b..9596bc41 100644
--- a/modules/info/helpers/info_block.php
+++ b/modules/info/helpers/info_block.php
@@ -31,6 +31,47 @@ class info_block_Core {
         $block->css_id = "g-metadata";
         $block->title = $theme->item()->is_album() ? t("Album info") : t("Photo info");
         $block->content = new View("info_block.html");
+        if ($theme->item->title && module::get_var("info", "show_title")) {
+          $info["title"] = array(
+            "label" => t("Title:"),
+            "value" => html::purify($theme->item->title)
+          );
+        }
+        if ($theme->item->description && module::get_var("info", "show_description")) {
+          $info["description"] = array(
+            "label" => t("Description:"),
+            "value" => nl2br(html::purify($theme->item->description))
+          );
+        }
+        if (!$theme->item->is_album() && module::get_var("info", "show_name")) {
+          $info["file_name"] = array(
+            "label" => t("File name:"),
+            "value" => html::clean($theme->item->name)
+          );
+        }
+        if ($theme->item->captured && module::get_var("info", "show_captured")) {
+          $info["captured"] = array(
+            "label" => t("Captured:"),
+            "value" => gallery::date_time($theme->item->captured)
+          );
+        }
+        if ($theme->item->owner && module::get_var("info", "show_owner")) {
+          $display_name = $theme->item->owner->display_name();
+          if ($theme->item->owner->url) {
+            $info["owner"] = array(
+              "label" => t("Owner:"),
+              "value" => "<a href=\"{$theme->item->owner->url}\">" . html::clean($display_name) . "</a>"
+            );
+          } else {
+            $info["owner"] = array(
+              "label" => t("Owner:"),
+              "value" => html::clean($display_name)
+            );
+          }
+        }
+        $block->content->metadata = $info;
+
+        module::event("info_block_get_metadata", $block, $theme->item);
       }
       break;
     }