wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'uiredesign' of ../evan into uiredesign

Browse Source
This commit is contained in:
sarven 2009-01-15 19:26:07 +00:00
commit 6b42b2a09c
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/action.php
View File

@ -58,8 +58,21 @@ class Action extends HTMLOutputter // lawsuit
{ {
var $args; var $args;
function Action() /**
* Constructor
*
* Just wraps the HTMLOutputter constructor.
*
* @param string $output URI to output to, default = stdout
* @param boolean $indent Whether to indent output, default true
*
* @see XMLOutputter::__construct
* @see HTMLOutputter::__construct
*/
function __construct($output='php://output', $indent=true)
{ {
parent::__construct($output, $indent);
} }
// For initializing members of the class // For initializing members of the class
@ -81,7 +94,7 @@ class Action extends HTMLOutputter // lawsuit
function showHead() function showHead()
{ {
// XXX: attributes (profile?) // XXX: attributes (profile?)
$this->startElement('head'); $this->elementStart('head');
$this->showTitle(); $this->showTitle();
$this->showStylesheets(); $this->showStylesheets();
$this->showScripts(); $this->showScripts();
@ -89,7 +102,7 @@ class Action extends HTMLOutputter // lawsuit
$this->showFeeds(); $this->showFeeds();
$this->showDescription(); $this->showDescription();
$this->extraHead(); $this->extraHead();
$this->elementElement('head'); $this->elementEnd('head');
} }
function showTitle() function showTitle()

2
lib/htmloutputter.php
View File

@ -122,7 +122,6 @@ class HTMLOutputter extends XMLOutputter
'lang' => $language)); 'lang' => $language));
} }
/** /**
* Ends an HTML document * Ends an HTML document
* *
@ -134,7 +133,6 @@ class HTMLOutputter extends XMLOutputter
$this->endXML(); $this->endXML();
} }
/** /**
* Output an HTML text input element * Output an HTML text input element
* *

2
lib/xmloutputter.php
View File

@ -72,7 +72,6 @@ class XMLOutputter
$this->xw = new XMLWriter(); $this->xw = new XMLWriter();
$this->xw->openURI($output); $this->xw->openURI($output);
$this->xw->setIndent($indent); $this->xw->setIndent($indent);
$this->xw->startDocument('1.0', 'UTF-8');
} }
/** /**
@ -87,6 +86,7 @@ class XMLOutputter
function startXML($doc=null, $public=null, $system=null) function startXML($doc=null, $public=null, $system=null)
{ {
$this->xw->startDocument('1.0', 'UTF-8');
if ($doc) { if ($doc) {
$this->xw->writeDTD($doc, $public, $system); $this->xw->writeDTD($doc, $public, $system);
} }