From b235fd6e5f2197869c8ef04637d990d2017a19bf Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 18:00:00 -0700
Subject: Pass the item into the block.

---
 modules/info/helpers/info_theme.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/info/helpers')

diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php
index 151885b7..2a761fb4 100644
--- a/modules/info/helpers/info_theme.php
+++ b/modules/info/helpers/info_theme.php
@@ -22,6 +22,7 @@ class info_theme_Core {
     if ($theme->item()) {
       $block = new Block();
       $block->css_id = "gMetadata";
+      $block->item = $theme->item();
       $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info");
       $block->content = new View("info_block.html");
       return $block;
-- 
cgit v1.2.3


From 24f0c4bd1914e5dc62d4fef936c901227620abbe Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 28 Jun 2009 18:10:42 -0700
Subject: Undo my last change; it's not the right fix for the problem.

---
 modules/info/helpers/info_theme.php    | 1 -
 modules/info/views/info_block.html.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules/info/helpers')

diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php
index 2a761fb4..151885b7 100644
--- a/modules/info/helpers/info_theme.php
+++ b/modules/info/helpers/info_theme.php
@@ -22,7 +22,6 @@ class info_theme_Core {
     if ($theme->item()) {
       $block = new Block();
       $block->css_id = "gMetadata";
-      $block->item = $theme->item();
       $block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info");
       $block->content = new View("info_block.html");
       return $block;
diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index 3a96937c..db621006 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -32,4 +32,4 @@
     <? endif ?>
   </li>
   <? endif ?>
-</ul>
\ No newline at end of file
+</ul>
-- 
cgit v1.2.3


From 0d105bcf9dfa0b34b390bd80f49965c563d48534 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Tue, 30 Jun 2009 23:29:53 -0600
Subject: Display owner's full name rather than username, ticket #421.

---
 modules/info/helpers/info_theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/info/helpers')

diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php
index 151885b7..863317a8 100644
--- a/modules/info/helpers/info_theme.php
+++ b/modules/info/helpers/info_theme.php
@@ -37,7 +37,7 @@ class info_theme_Core {
     }
     if ($item->owner) {
       $results .= "<li>";
-      $results .= t("By: %owner_name", array("owner_name" => "<a href=\"#\">{$item->owner->name}</a>"));
+      $results .= t("By: %owner_name", array("owner_name" => "<a href=\"#\">{$item->owner->full_name}</a>"));
       $results .= "</li>";
     }
     return $results;
-- 
cgit v1.2.3


From ff0b66a1a4ed189c3e02a8ad50a63f4d65b3bfa7 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 12 Jul 2009 22:53:47 -0600
Subject: Put owner's url into user link. Seems better than displaying email
 until we have something like a user profile page.

---
 modules/info/helpers/info_theme.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules/info/helpers')

diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php
index 863317a8..51378e54 100644
--- a/modules/info/helpers/info_theme.php
+++ b/modules/info/helpers/info_theme.php
@@ -37,7 +37,11 @@ class info_theme_Core {
     }
     if ($item->owner) {
       $results .= "<li>";
-      $results .= t("By: %owner_name", array("owner_name" => "<a href=\"#\">{$item->owner->full_name}</a>"));
+      if ($item->owner->url) {
+        $results .= t("By: %owner_name", array("owner_name" => "<a href=\"{$item->owner->url}\">{$item->owner->full_name}</a>"));
+      } else {
+        $results .= t("By: %owner_name", array("owner_name" => "{$item->owner->full_name}"));
+      }
       $results .= "</li>";
     }
     return $results;
-- 
cgit v1.2.3