diff options
author | Florian Pritz <bluewind@xinu.at> | 2015-04-09 15:17:13 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2015-04-09 15:20:10 +0200 |
commit | a11e06d4906c2e1186779b42d5e87a17f66c50ea (patch) | |
tree | 1f37352641a20cfeb540a86e57dac3a8b5603f34 /application/libraries | |
parent | 8be9c484e77b5bddb1964970b179f174c2f1105a (diff) |
Fix mime2lexer failing when using pygments info
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/libraries')
-rw-r--r-- | application/libraries/Pygments.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/application/libraries/Pygments.php b/application/libraries/Pygments.php index 13d82d2ad..04d4e670c 100644 --- a/application/libraries/Pygments.php +++ b/application/libraries/Pygments.php @@ -21,7 +21,7 @@ class Pygments { } private static function get_pygments_info() { - return cache_function_full('pygments_info', 1800, function() { + return cache_function_full('pygments_info-v2', 1800, function() { ob_start(); passthru("python ".escapeshellarg(FCPATH."scripts/get_lexer_list.py")); $output = ob_get_clean(); @@ -148,7 +148,7 @@ class Pygments { // fall back to pygments own list if not found in our list foreach (self::get_pygments_info() as $lexer) { if (isset($lexer['mimetypes'][$this->mimetype])) { - return $lexer; + return $lexer['names'][0]; } } |