From d698a19e0e9acdcb81c5245d1f681546b604a1f3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 10 Sep 2010 08:40:30 -0700
Subject: Transfer deleted files to the active user.  Or at least say that's
 what we're going to do, we actually transfer them to one of the admins

---
 modules/user/views/admin_users_delete_user.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/user')

diff --git a/modules/user/views/admin_users_delete_user.html.php b/modules/user/views/admin_users_delete_user.html.php
index 4b79a305..44777ae5 100644
--- a/modules/user/views/admin_users_delete_user.html.php
+++ b/modules/user/views/admin_users_delete_user.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div id="g-admin-users-delete-user">
   <p>
-    <?= t("Really delete <b>%name</b>?  Any photos, movies or albums owned by this user will transfer ownership to <b>%new_owner</b>.", array("name" => $user->display_name(), "new_owner" => identity::admin_user()->display_name())) ?>
+    <?= t("Really delete <b>%name</b>?  Any photos, movies or albums owned by this user will transfer ownership to <b>%new_owner</b>.", array("name" => $user->display_name(), "new_owner" => identity::active_user()->display_name())) ?>
   </p>
   <?= $form ?>
 </div>
-- 
cgit v1.2.3


From a88b3f580812e7670933a6d695c89ef93f0142d4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 11 Sep 2010 00:47:48 -0700
Subject: Implement IdentityProvider_Gallery_Driver::admin_user() properly such
 that it's not hardcoded to return the user with id 2.  Create
 user::admin_user() which finds an appropriate admin and returns it. Fixes
 #1358.

---
 modules/user/helpers/user.php                              | 14 ++++++++++++++
 .../user/libraries/drivers/IdentityProvider/Gallery.php    |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'modules/user')

diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 55153263..be50d6d1 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -35,6 +35,20 @@ class user_Core {
     return model_cache::get("user", 1);
   }
 
+  /**
+   * Return an admin user.  Prefer the currently logged in user, if possible.
+   *
+   * @return User_Model
+   */
+  static function admin_user() {
+    $active = identity::active_user();
+    if ($active->admin) {
+      return $active;
+    }
+
+    return ORM::factory("user")->where("admin", "=", 1)->order_by("id", "ASC")->find();
+  }
+
   /**
    * Is the password provided correct?
    *
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 44433ad7..73ac9bd0 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -32,7 +32,7 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
    * @see IdentityProvider_Driver::guest.
    */
   public function admin_user() {
-    return self::lookup_user(2);
+    return user::admin_user();
   }
 
   /**
-- 
cgit v1.2.3