Merge pull request pencilblue#1211 from pencilblue/issue/1208

pencilblue#1208 Fixes issue where public content 404 was causing failure

include/http/request_handler.js

@@ -670,20 +670,20 @@ module.exports = function RequestHandlerModule(pb) {
         var self = this;
         fs.readFile(absolutePath, function(err, content){
             if (err) {
+
+                //TODO [1.0] change default content type to JSON and refactor public file serving so it falls inline with other controller functions
+                self.themeRoute = self.themeRoute || {};
+                self.themeRoute.content_type = 'application/json';
                 return self.serve404();
             }
 
             //build response structure
+            //guess at content-type
             var data = {
-                content: content
+                content: content,
+                content_type: mime.lookup(absolutePath)
             };
 
-            //guess at content-type
-            var mimeType = mime.lookup(absolutePath);
-            if (mimeType) {
-                data.content_type = mimeType;
-            }
-
             //send response
             self.writeResponse(data);
         });
@@ -743,6 +743,9 @@ module.exports = function RequestHandlerModule(pb) {
             return false;
         }
 
+        //default the options object
+        options = options || {};
+
         //bump the error count so handlers will know if we are recursively trying to handle errors.
         this.errorCount++;