From 8c033de2ed775187c43f7d3230cc08858339e290 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sat, 24 Jul 2010 14:01:34 -0400
Subject: [PATCH] Rename Ansel_Gallery::getOwner to Ansel_Gallery::getIdentity

---
 ansel/lib/Gallery.php                              | 7 ++-----
 ansel/lib/Tile/Gallery.php                         | 2 +-
 ansel/lib/View/GalleryRenderer/Gallery.php         | 2 +-
 ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 2 +-
 ansel/lib/Widget/OtherGalleries.php                | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ansel/lib/Gallery.php b/ansel/lib/Gallery.php
index 8c9f87f66..99f65781e 100644
--- a/ansel/lib/Gallery.php
+++ b/ansel/lib/Gallery.php
@@ -442,12 +442,9 @@ class Ansel_Gallery extends Horde_Share_Object_Sql_Hierarchical
     /**
      * Returns this share's owner's Identity object.
      *
-     * @TODO: Maybe rename this to getIdentity() to avoid confusion with
-     *        the share's owner attribute?
-     *
-     * @return Identity object for the owner of this gallery.
+     * @return Horde_Prefs_Identity object for the owner of this gallery.
      */
-    public function getOwner()
+    public function getIdentity()
     {
         return $GLOBALS['injector']->getInstance('Horde_Prefs_Identity')->getIdentity($this->data['share_owner']);
     }
diff --git a/ansel/lib/Tile/Gallery.php b/ansel/lib/Tile/Gallery.php
index 6a16ce0f8..d297855e1 100644
--- a/ansel/lib/Tile/Gallery.php
+++ b/ansel/lib/Tile/Gallery.php
@@ -100,7 +100,7 @@ class Ansel_Tile_Gallery
                                                   'owner' => $gallery->get('owner'),
                                                   'groupby' => 'owner'),
                                             true)->link();
-            $gallery_owner = $gallery->getOwner();
+            $gallery_owner = $gallery->getIdentity();
             $owner_string = $gallery_owner->getValue('fullname');
             if (empty($owner_string)) {
                 $owner_string = $gallery->get('owner');
diff --git a/ansel/lib/View/GalleryRenderer/Gallery.php b/ansel/lib/View/GalleryRenderer/Gallery.php
index 42775d28c..624523469 100644
--- a/ansel/lib/View/GalleryRenderer/Gallery.php
+++ b/ansel/lib/View/GalleryRenderer/Gallery.php
@@ -32,7 +32,7 @@ class Ansel_View_GalleryRenderer_Gallery extends Ansel_View_GalleryRenderer_Base
         global $conf, $prefs, $registry;
 
         $galleryOwner = $this->view->gallery->get('owner');
-        $id = $this->view->gallery->getOwner();
+        $id = $this->view->gallery->getIdentity();
         $owner = $id->getValue('fullname');
         if (!$owner) {
             $owner = $galleryOwner;
diff --git a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php
index 89cb213b7..8cf874dac 100644
--- a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php
+++ b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php
@@ -42,7 +42,7 @@ class Ansel_View_GalleryRenderer_GalleryLightbox extends Ansel_View_GalleryRende
         global $conf, $prefs, $registry;
 
         $galleryOwner = $this->view->gallery->get('owner');
-        $id = $this->view->gallery->getOwner();
+        $id = $this->view->gallery->getIdentity();
         $owner = $id->getValue('fullname');
         if (!$owner) {
             $owner = $galleryOwner;
diff --git a/ansel/lib/Widget/OtherGalleries.php b/ansel/lib/Widget/OtherGalleries.php
index 1b7d233e3..c719c69db 100644
--- a/ansel/lib/Widget/OtherGalleries.php
+++ b/ansel/lib/Widget/OtherGalleries.php
@@ -20,7 +20,7 @@ class Ansel_Widget_OtherGalleries extends Ansel_Widget_Base
     public function attach(Ansel_View_Base $view)
     {
         parent::attach($view);
-        $owner = $this->_view->gallery->getOwner();
+        $owner = $this->_view->gallery->getIdentity();
         $name = $owner->getValue('fullname');
         if (!$name) {
             $name = $this->_view->gallery->get('owner');
-- 
2.11.0