Fix mime types for those that are handled by the source code highlighter.

These need to be application/x-extension-*  and not x-extension/*

diff --git a/horde/config/mime_drivers.php.dist b/horde/config/mime_drivers.php.dist
index 5a345ad..27ccc83 100644 (file)
--- a/horde/config/mime_drivers.php.dist
+++ b/horde/config/mime_drivers.php.dist
@@ -148,25 +148,25 @@ $mime_drivers = array(
             'text/x-sql',
             'text/x-tex',
             'text/xml',
-            'x-extension/bat',
-            'x-extension/c',
-            'x-extension/cpp',
-            'x-extension/cs',
-            'x-extension/css',
-            'x-extension/html',
-            'x-extension/js',
-            'x-extension/perl',
-            'x-extension/php',
-            'x-extension/php3s',
-            'x-extension/phps',
-            'x-extension/pl',
-            'x-extension/py',
-            'x-extension/python',
-            'x-extension/rb',
-            'x-extension/ruby',
-            'x-extension/vb',
-            'x-extension/vba',
-            'x-extension/xml',
+            'application/x-extension-bat',
+            'application/x-extension-c',
+            'application/x-extension-cpp',
+            'application/x-extension-cs',
+            'application/x-extension-css',
+            'application/x-extension-html',
+            'application/x-extension-js',
+            'application/x-extension-perl',
+            'application/x-extension-php',
+            'application/x-extension-php3s',
+            'application/x-extension-phps',
+            'application/x-extension-pl',
+            'application/x-extension-py',
+            'application/x-extension-python',
+            'application/x-extension-rb',
+            'application/x-extension-ruby',
+            'application/x-extension-vb',
+            'application/x-extension-vba',
+            'application/x-extension-xml',
         ),
         'icons' => array(
             'default'                   => 'text.png',

diff --git a/wicked/lib/Text_Wiki/Render/Xhtml/Code2.php b/wicked/lib/Text_Wiki/Render/Xhtml/Code2.php
index 43bb352..1d0dbd4 100644 (file)
--- a/wicked/lib/Text_Wiki/Render/Xhtml/Code2.php
+++ b/wicked/lib/Text_Wiki/Render/Xhtml/Code2.php
@@ -18,8 +18,8 @@ class Text_Wiki_Render_Xhtml_Code2 extends Text_Wiki_Render_Xhtml_Code
 
         $part = new Horde_Mime_Part();
         $part->setContents($options['text']);
-        $part->setType("x-extension/$type");
-        $viewer = new Horde_Core_Mime_Viewer_Syntaxhighlighter($part, array('registry' => $GLOBALS['registry']));
+        $part->setType("application/x-extension-$type");
+        $viewer = $GLOBALS['injector']->getInstance('Horde_Core_Factory_MimeViewer')->create($part);
         $data = $viewer->render('inline');
         $data = reset($data);
         return $data['data'];