Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / apiexternalprofileshow.php

diff --git a/actions/apiexternalprofileshow.php b/actions/apiexternalprofileshow.php
index 8a007e18b3f4c5f5050a2c391b74fa7b2f03cdb8..2fe7450034f404adb108798abb4eb01d4d4c841f 100644 (file)
--- a/actions/apiexternalprofileshow.php
+++ b/actions/apiexternalprofileshow.php
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  API
- * @package   GNUSocial
+ * @package   GNUsocial
  * @author    Hannes Mannerheim <h@nnesmannerhe.im>
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://www.gnu.org/software/social/
@@ -42,7 +42,7 @@ class ApiExternalProfileShowAction extends ApiPrivateAuthAction
      * @return boolean success flag
      *
      */
-    protected function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -53,7 +53,7 @@ class ApiExternalProfileShowAction extends ApiPrivateAuthAction
         $profileurl = urldecode($this->arg('profileurl'));        
 
         // TODO: Make this more ... unique!
-        $this->profile = Profile::staticGet('profileurl', $profileurl);        
+        $this->profile = Profile::getKV('profileurl', $profileurl);        
 
         if (!($this->profile instanceof Profile)) {
             // TRANS: Client error displayed when requesting profile information for a non-existing profile.
@@ -92,7 +92,7 @@ class ApiExternalProfileShowAction extends ApiPrivateAuthAction
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }