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

1 files changed, 14 insertions, 0 deletions

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
@@ -36,6 +36,20 @@ class user_Core {
   }
 
   /**
+   * 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?
    *
    * @param user User Model