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 7cd892022dfd8e0e77996ff83408d3f6747ec11f..e84c77768569d0f13d9bdffc3b66b1f3d3ddb6fc 100644 (file)
--- a/lib/currentuserdesignaction.php
+++ b/lib/currentuserdesignaction.php
@@ -63,6 +63,8 @@ class CurrentUserDesignAction extends Action
         parent::prepare($argarray);
 
         $this->cur = common_current_user();
+
+       return true;
     }
 
     /**
@@ -76,7 +78,7 @@ class CurrentUserDesignAction extends Action
     {
         if (!empty($this->cur)) {
 
-            $design = $cur->getDesign();
+            $design = $this->cur->getDesign();
 
             if (!empty($design)) {
                 return $design;
@@ -86,4 +88,9 @@ class CurrentUserDesignAction extends Action
         return parent::getDesign();
     }
 
+    function getCurrentUser()
+    {
+       return $this->cur;
+    }
 }
+