summaryrefslogtreecommitdiffstats
path: root/system/core/Output.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-03-13 13:34:13 +0100
committerAndrey Andreev <narf@bofh.bg>2013-03-13 13:34:13 +0100
commit493454d5498af095d2a2d8ac106dff22484f9ce2 (patch)
tree5d5f50c2ac75f372e284a1ec0de7614cea87c538 /system/core/Output.php
parent219565d05f6b223c28e24422b9d244b201890699 (diff)
parent7b90325ceb8aa6fdb4680afe959927fc000bf548 (diff)
Merge pull request #2326 from bayssmekanique/develop
Output Class Minify Function Change
Diffstat (limited to 'system/core/Output.php')
-rw-r--r--system/core/Output.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/system/core/Output.php b/system/core/Output.php
index 25ecd496c..3320ae154 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -793,6 +793,8 @@ class CI_Output {
case 'text/css':
case 'text/javascript':
+ case 'application/javascript':
+ case 'application/x-javascript':
$output = $this->_minify_script_style($output);