warn about remote fork config in setup and help

[phorkie.git] / src / phorkie / Renderer / Geshi.php

diff --git a/src/phorkie/Renderer/Geshi.php b/src/phorkie/Renderer/Geshi.php
index 2010ead230760ea5dab72bdfc2c5b517ffedc1bd..0c545ed5dff3e9d674959eb9e2f07566a991a99c 100644 (file)
--- a/src/phorkie/Renderer/Geshi.php
+++ b/src/phorkie/Renderer/Geshi.php
@@ -15,10 +15,12 @@ class Renderer_Geshi
     {
         /**
          * Yes, geshi needs to be in your include path
-         * We use the mediawiki geshi extension package.
+         * We use the geshi pear package.
          */
-        require_once $GLOBALS['phorkie']['cfg']['geshi'];
-        $geshi = new \GeSHi($file->getContent(), $this->getType($file));
+        if (!class_exists('\\geshi', true)) {
+            require_once $GLOBALS['phorkie']['cfg']['geshi'];
+        }
+        $geshi = new \geshi($file->getContent(), $this->getType($file));
         $geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
         $geshi->set_header_type(GESHI_HEADER_DIV);
 
@@ -28,7 +30,7 @@ class Renderer_Geshi
         }
 
         return '<div class="code">'
-            . $geshi->parse_code()
+            . str_replace('&nbsp;', '&#160;', $geshi->parse_code())
             . '</div>';
     }