Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / lib / currentuserdesignaction.php

diff --git a/lib/currentuserdesignaction.php b/lib/currentuserdesignaction.php
index 490f87d13c259a92f1ae6d17f90caf0aa60fc76c..e84c77768569d0f13d9bdffc3b66b1f3d3ddb6fc 100644 (file)
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -22,7 +22,7 @@
  * @category  Action
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 StatusNet, Inc.
+ * @copyright 2009-2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -40,12 +40,33 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @category Action
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
+ * @author   Zach Copley    <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  *
  */
 class CurrentUserDesignAction extends Action
 {
+
+    protected $cur = null; // The current user
+
+    /**
+     * For initializing members of the class. Set a the
+     * current user here.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $this->cur = common_current_user();
+
+       return true;
+    }
+
     /**
      * A design for this action
      *
@@ -55,11 +76,9 @@ class CurrentUserDesignAction extends Action
      */
     function getDesign()
     {
-        $cur = common_current_user();
-
-        if (!empty($cur)) {
+        if (!empty($this->cur)) {
 
-            $design = $cur->getDesign();
+            $design = $this->cur->getDesign();
 
             if (!empty($design)) {
                 return $design;
@@ -68,4 +87,10 @@ class CurrentUserDesignAction extends Action
 
         return parent::getDesign();
     }
+
+    function getCurrentUser()
+    {
+       return $this->cur;
+    }
 }
+