4 files changed, 16 insertions, 3 deletions
diff --git a/application/views/file/html_footer.php b/application/views/file/html_footer.php
index a2a1cfec2..3a4b05505 100644
--- a/application/views/file/html_footer.php
+++ b/application/views/file/html_footer.php
@@ -4,4 +4,6 @@
     </div>
     </div>
 
-<?php include(FCPATH."application/views/footer.php");
+<?php
+$force_full_html = true;
+include(FCPATH."application/views/footer.php");
diff --git a/application/views/file/html_header.php b/application/views/file/html_header.php
index 67e9d0cca..760672166 100644
--- a/application/views/file/html_header.php
+++ b/application/views/file/html_header.php
@@ -1,4 +1,6 @@
-<?php include(FCPATH."application/views/header.php"); ?>
+<?php
+$force_full_html = true;
+include(FCPATH."application/views/header.php"); ?>
 
 	</div>
 
diff --git a/application/views/footer.php b/application/views/footer.php
index 92b305999..3d6901748 100644
--- a/application/views/footer.php
+++ b/application/views/footer.php
@@ -1,3 +1,8 @@
+<?php
+if (is_cli_client() && !isset($force_full_html)) {
+	return;
+}
+?>
 	</div>
 
 	<script src="<?php echo link_with_mtime("/data/js/jquery-1.8.2.min.js"); ?>"></script>
diff --git a/application/views/header.php b/application/views/header.php
index 4f2c46e79..2e978bda2 100644
--- a/application/views/header.php
+++ b/application/views/header.php
@@ -1,4 +1,8 @@
-<!DOCTYPE html>
+<?php
+if (is_cli_client() && !isset($force_full_html)) {
+	return;
+}
+?><!DOCTYPE html>
 <html lang="en">
 
 <head>