From a793d211d2a47fb4b61bcb925f6faf2e610072dd Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Sat, 10 Oct 2015 20:51:53 +0200
Subject: [PATCH] Match parent class definition of clientError

---
 actions/apimediaupload.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions/apimediaupload.php b/actions/apimediaupload.php
index 3a06a75e85..fd1ff565c7 100644
--- a/actions/apimediaupload.php
+++ b/actions/apimediaupload.php
@@ -30,7 +30,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Upload an image via the API.  Returns a shortened URL for the image
- * to the user.
+ * to the user. Apparently modelled after a former Twitpic API.
  *
  * @category API
  * @package  StatusNet
@@ -108,7 +108,7 @@ class ApiMediaUploadAction extends ApiAuthAction
      *
      * @param String $msg an error message
      */
-    function clientError($msg)
+    function clientError($msg, $code=400, $format=null)
     {
         $this->initDocument();
         $this->elementStart('rsp', array('stat' => 'fail'));
-- 
2.39.5