GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
sarven 2009-01-15 19:26:07 +00:00
parent 4a2aebe5cf f0b4e7094c
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;
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
@ -81,7 +94,7 @@ class Action extends HTMLOutputter // lawsuit
function showHead()
{
// XXX: attributes (profile?)
$this->startElement('head');
$this->elementStart('head');
$this->showTitle();
$this->showStylesheets();
$this->showScripts();
@ -89,7 +102,7 @@ class Action extends HTMLOutputter // lawsuit
$this->showFeeds();
$this->showDescription();
$this->extraHead();
$this->elementElement('head');
$this->elementEnd('head');
}
function showTitle()

2
lib/htmloutputter.php
View File

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

2
lib/xmloutputter.php
View File

@ -72,7 +72,6 @@ class XMLOutputter
$this->xw = new XMLWriter();
$this->xw->openURI($output);
$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)
{
$this->xw->startDocument('1.0', 'UTF-8');
if ($doc) {
$this->xw->writeDTD($doc, $public, $system);
}