Merge remote-tracking branch 'origin/master'

Conflicts:
	src/phorkie/Renderer/Geshi.php
	src/phorkie/SetupCheck.php

diff --cc data/config.default.php
Simple merge

diff --cc src/phorkie/Renderer/Geshi.php
index c4227161a91d72448891be6cd2714ee26139ccdf,9cb15a20d106da7ae27f3302ac1164ae3502fa39..0c545ed5dff3e9d674959eb9e2f07566a991a99c
--- 1/src/phorkie/Renderer/Geshi.php
--- 2/src/phorkie/Renderer/Geshi.php
+++ b/src/phorkie/Renderer/Geshi.php
@@@ -13,14 -13,10 +13,14 @@@ class Renderer_Gesh
       */
      public function toHtml(File $file, Tool_Result $res = null)
      {
 -        if (!class_exists('\\GeSHi', true)) {
 -            require_once 'geshi.php';
 +        /**
 +         * Yes, geshi needs to be in your include path
-          * We use the mediawiki geshi extension package.
++         * We use the geshi pear package.
 +         */
 +        if (!class_exists('\\geshi', true)) {
 +            require_once $GLOBALS['phorkie']['cfg']['geshi'];
          }
 -        $geshi = new \GeSHi($file->getContent(), $this->getType($file));
 +        $geshi = new \geshi($file->getContent(), $this->getType($file));
          $geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
          $geshi->set_header_type(GESHI_HEADER_DIV);
  

diff --cc www/www-header.php
Simple merge