diff -r 2d37a11fabd8 -r c1be67a50d81 ajax.php
--- a/ajax.php	Wed Aug 26 13:43:11 2009 -0400
+++ b/ajax.php	Wed Aug 26 23:25:39 2009 -0400
@@ -75,7 +75,7 @@
           'have_draft' => false
         );
       
-      $return['page_format'] = $paths->cpage['page_format'];
+      $return['page_format'] = $page->ns->cdata['page_format'];
       if ( $return['page_format'] == 'xhtml' )
       {
         // gently process headings to make tinymce format them correctly
@@ -491,7 +491,7 @@
       switch($_GET['to'])
       {
         case 'xhtml':
-          $result = RenderMan::render($_POST['text'], RENDER_WIKI_DEFAULT | RENDER_BLOCKONLY);
+          $result = RenderMan::render($_POST['text'], RENDER_BLOCK | RENDER_NOSMILIES, false);
           break;
         case 'wikitext':
           $result = RenderMan::reverse_render($_POST['text']);