Fix bug #27: render .json files

diff --git a/ChangeLog b/ChangeLog
index 03855dc6b078abce3e8e4091fa75e23c8d604510..fc17753ce403c0734757e64398119980c061d732 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-01  Christian Weiske  <cweiske@cweiske.de>
+
+       * Fix bug #27: render .json files
+
 2012-09-28  Christian Weiske  <cweiske@cweiske.de>
 
        * Check for OpenID package in SetupCheck

diff --git a/data/config.default.php b/data/config.default.php
index abcb43e071a4cdcd397495c60f6fdf4ccd9f7be7..1374b1b96ec20a04d3b7fbc87275f1433e6a7ed9 100644 (file)
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -66,6 +66,12 @@ $GLOBALS['phorkie']['languages'] = array(
         'mime'  => 'application/javascript',
         'geshi' => 'javascript'
     ),
+    'json' => array(
+        'title' => 'Javascript',
+        'mime'  => 'application/javascript',
+        'geshi' => 'javascript',
+        'show'  => false
+    ),
     'md' => array(
         'title' => 'Markdown',
         'mime'  => 'text/x-markdown',