Added type-hints for StartInitializeRouter hooks.

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index 4a815c148360efa6d0064c411cc6b06a669a245e..5f12b4e94b4791b2ffb194f2c7ea1a3fa98bb402 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -423,7 +423,9 @@ class Action extends HTMLOutputter // lawsuit
             if (Event::handle('StartShowStatusNetScripts', array($this))) {
                 $this->script('util.js');
                 $this->script('xbImportNode.js');
-                $this->script('geometa.js');
+                if (common_location_shared()) {
+                    $this->script('geometa.js');
+                }
 
                 // This route isn't available in single-user mode.
                 // Not sure why, but it causes errors here.
@@ -1221,7 +1223,7 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return false;
     }
@@ -1490,7 +1492,7 @@ class Action extends HTMLOutputter // lawsuit
             }
             $this->initDocument('json');
             $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
-            $this->text(json_encode($error_array));
+            print(json_encode($error_array));
             $this->endDocument('json');
             break;
         case 'text':