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

[quix0rs-gnu-social.git] / plugins / LinkPreview / actions / oembedproxy.php

diff --git a/plugins/LinkPreview/actions/oembedproxy.php b/plugins/LinkPreview/actions/oembedproxy.php
index 7e54aca57067de6bce92a0e4d76f7f85c22181a5..c0473fb597633a75929b96edc397e7153ed2039f 100644 (file)
--- a/plugins/LinkPreview/actions/oembedproxy.php
+++ b/plugins/LinkPreview/actions/oembedproxy.php
@@ -46,10 +46,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class OembedproxyAction extends OembedAction
 {
-    function handle($args)
+    function handle(array $args=array())
     {
         // Trigger short error responses; not a human-readable web page.
-        StatusNet::setApi(true);
+        GNUsocial::setApi(true);
 
         // We're not a general oEmbed proxy service; limit to valid sessions.
         $token = $this->trimmed('token');