Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.356 -r1.357
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	18 May 2018 10:15:21 -0000	1.356
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	20 May 2018 10:13:23 -0000	1.357
@@ -1393,7 +1393,7 @@
     
     set admin_link  [$context_package_id make_link -privilege admin -link admin/ $context_package_id {} {}] 
     set index_link  [$context_package_id make_link -privilege public -link "" $context_package_id {} {}]
-    set toc_link  [$context_package_id make_link -privilege public -link "list" $context_package_id {} {}]
+    set toc_link    [$context_package_id make_link -privilege public -link "list" $context_package_id {} {}]
     set import_link [$context_package_id make_link -privilege admin -link "" $context_package_id {} {}]
     set page_show_link [$page_package_id make_link -privilege admin [self] show-object return_url]
 
@@ -1656,6 +1656,7 @@
         } on error {errMsg} {
           ns_return 200 text/html "Error in Page ${:name}: $errMsg<br>$template"
         }
+        ad_script_abort
       } else {
         # use adp file
         #:log "use adp"
@@ -1673,7 +1674,8 @@
         }
       }
     } else {
-      ns_return 200 [::xo::cc get_parameter content-type text/html] $content
+      set :mime_type [::xo::cc get_parameter content-type text/html]
+      return $content
     }
   }
 }