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

Allow the toggling of XMLWriter's indenting on and off

Browse Source 
IE needs and unindented XML response in for ajax calls.

darcs-hash:20081123211348-7b5ce-426c07ee1d1884c691b659e8a9b359bb95afc61e.gz
This commit is contained in:
Zach Copley 2008-11-23 16:13:48 -05:00
parent 63a1b9151a
commit 8d8bc706d8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/newnotice.php
View File

@ -84,7 +84,7 @@ class NewnoticeAction extends Action {
common_broadcast_notice($notice);
if ($this->boolean('ajax')) {
common_start_html('text/xml;charset=utf-8');
common_start_html('text/xml;charset=utf-8', false);
common_element_start('head');
common_element('title', null, _('Notice posted'));
common_element_end('head');
@ -107,7 +107,7 @@ class NewnoticeAction extends Action {
}
function ajax_error_msg($msg) {
common_start_html('text/xml;charset=utf-8');
common_start_html('text/xml;charset=utf-8', false);
common_element_start('head');
common_element('title', null, _('Ajax Error'));
common_element_end('head');

8
lib/util.php
View File

@ -114,11 +114,11 @@ function common_element($tag, $attrs=NULL, $content=NULL) {
common_element_end($tag);
}
function common_start_xml($doc=NULL, $public=NULL, $system=NULL) {
function common_start_xml($doc=NULL, $public=NULL, $system=NULL, $indent=true) {
global $xw;
$xw = new XMLWriter();
$xw->openURI('php://output');
$xw->setIndent(true);
$xw->setIndent($indent);
$xw->startDocument('1.0', 'UTF-8');
if ($doc) {
$xw->writeDTD($doc, $public, $system);
@ -235,7 +235,7 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL, $headercall=
common_element_start('div', array('id' => 'content'));
}
function common_start_html($type=NULL) {
function common_start_html($type=NULL, $indent=true) {
if (!$type) {
$httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL;
@ -255,7 +255,7 @@ function common_start_html($type=NULL) {
common_start_xml('html',
'-//W3C//DTD XHTML 1.0 Strict//EN',
'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd', $indent);
# FIXME: correct language for interface