Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index 71d57e2d56647afad12e413dda029a912c6e19bc..463f91be305a8d542b24e42d188589170f585cfd 100644 (file)
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -63,12 +63,15 @@ class XMLOutputter
      *
      * Initializes the wrapped XMLWriter.
      *
-     * @param string  $output URL for outputting, defaults to stdout
+     * @param string  $output URL for outputting, if null it defaults to stdout ('php://output')
      * @param boolean $indent Whether to indent output, default true
      */
 
-    function __construct($output='php://output', $indent=null)
+    function __construct($output=null, $indent=null)
     {
+        if (is_null($output)) {
+            $output = 'php://output';
+        }
         $this->xw = new XMLWriter();
         $this->xw->openURI($output);
         if(is_null($indent)) {