Merge branch 'nightly' of gitorious.org:social/mainline into nightly

[quix0rs-gnu-social.git] / plugins / GNUsocialProfileExtensions / actions / bio.php

diff --git a/plugins/GNUsocialProfileExtensions/actions/bio.php b/plugins/GNUsocialProfileExtensions/actions/bio.php
index 6cfded4e36d2dd0dd158301c1b1c2ca9a829c6d0..fc49003cb46ef8e6de867c747206046dc4d8eba9 100644 (file)
--- a/plugins/GNUsocialProfileExtensions/actions/bio.php
+++ b/plugins/GNUsocialProfileExtensions/actions/bio.php
@@ -22,7 +22,7 @@
  * @category  Widget
  * @package   GNU Social
  * @author    Max Shinn <trombonechamp@gmail.com>
- * @copyright 2010 Free Software Foundation, Inc.
+ * @copyright 2011 Free Software Foundation, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  */
 
@@ -38,21 +38,20 @@ class BioAction extends Action
 {
     var $user = null;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         $args = $this->returnToArgs();
-        $this->profile = Profile::staticGet('nickname', $args[1]['nickname']);
+        $this->profile = Profile::getKV('nickname', $args[1]['nickname']);
         //die(print_r($this->profile));
         gnusocial_profile_merge($this->profile);
-        $this->avatar = $this->profile->getAvatar(96);
 
         return true;
 
     }
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         $this->showPage();
@@ -101,3 +100,5 @@ class BioAction extends Action
     }
 
 }
+
+