5 files changed, 16 insertions, 23 deletions
diff --git a/views/xml/api/output.php b/views/xml/api/output.php
index c2385b6e3..42afd44bb 100644
--- a/views/xml/api/output.php
+++ b/views/xml/api/output.php
@@ -5,8 +5,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  */
 
diff --git a/views/xml/messages/exceptions/exception.php b/views/xml/messages/exceptions/exception.php
index cc899ac18..66a0f2b96 100644
--- a/views/xml/messages/exceptions/exception.php
+++ b/views/xml/messages/exceptions/exception.php
@@ -5,19 +5,16 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  *
  * @uses $vars['object'] An exception
  */
 
-global $CONFIG;
 ?>
 <!--
-<?php echo get_class($vars['object']); ?>: <?php echo autop($vars['object']->getMessage()); ?>
+<?php echo get_class($vars['object']); ?>: <?php echo elgg_autop($vars['object']->getMessage()); ?>
 
 
-<?php if (isset($CONFIG->debug)) { ?>
+<?php if (elgg_get_config('debug')) { ?>
 <?php
 
 		echo print_r($vars['object'], true);
diff --git a/views/xml/page/default.php b/views/xml/page/default.php
new file mode 100644
index 000000000..0f0aecbe4
--- /dev/null
+++ b/views/xml/page/default.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Elgg XML output pageshell
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+header("Content-Type: text/xml");
+// web server will handle setting the content length
+//header("Content-Length: " . strlen($vars['body']));
+echo "<?xml version='1.0' encoding='UTF-8'?>\n";
+echo $vars['body'];
+\ No newline at end of file
diff --git a/views/xml/pageshells/pageshell.php b/views/xml/pageshells/pageshell.php
deleted file mode 100644
index 6e89e389a..000000000
--- a/views/xml/pageshells/pageshell.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * Elgg XML output pageshell
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-
-header("Content-Type: text/xml");
-header("Content-Length: " . strlen($vars['body']));
-echo $vars['body'];
-\ No newline at end of file
diff --git a/views/xml/xml-rpc/output.php b/views/xml/xml-rpc/output.php
index d3ea5bc97..4276029d1 100644
--- a/views/xml/xml-rpc/output.php
+++ b/views/xml/xml-rpc/output.php
@@ -4,8 +4,6 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
  */
 
 $result = $vars['result'];