diff options
| -rw-r--r-- | actions/newnotice.php | 4 | ||||
| -rw-r--r-- | lib/util.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php index 3c9c499c2..a24925ec3 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -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'); diff --git a/lib/util.php b/lib/util.php index 18e65be8b..ec62a4652 100644 --- a/lib/util.php +++ b/lib/util.php @@ -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 |