summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-06-01 09:35:09 +0200
committerFlorian Pritz <bluewind@xinu.at>2015-06-01 09:35:09 +0200
commit8b3525c2b79f74089b623ca6870ddb9b06270e5d (patch)
tree96d7667da18b8afb36feb99ebfe1dba3259d5eb1
parent381c1def9cd224864a1c799eb6a9604b3fee1e13 (diff)
Allow stderr for pygments
This happens when an invalid lexer is used so until we use the exceptions this should not be forbidden since we won't fall back to plain text then. Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/controllers/file.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/application/controllers/file.php b/application/controllers/file.php
index 83204c318..8b08bdea8 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -252,7 +252,6 @@ class File extends MY_Controller {
} else {
// TODO: use exec safe and catch exception
$ret = (new \libraries\ProcRunner(array('pygmentize', '-F', 'codetagify', '-O', 'encoding=guess,outencoding=utf8,stripnl=False', '-l', $lexer, '-f', 'html', $file)))
- ->forbid_stderr()
->exec();
// Last 2 items are "</pre></div>" and ""
$lines_to_remove = 2;