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

Conflicts:
	modules/slideshow/helpers/slideshow_event.php

1 files changed, 5 insertions, 1 deletions

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;