Merge remote-tracking branch 'origin/master'
authorChristian Weiske <cweiske@cweiske.de>
Fri, 4 Jul 2014 05:37:06 +0000 (07:37 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Fri, 4 Jul 2014 05:37:06 +0000 (07:37 +0200)
Conflicts:
src/phorkie/Renderer/Geshi.php
src/phorkie/SetupCheck.php

1  2 
data/config.default.php
src/phorkie/Renderer/Geshi.php
www/www-header.php

Simple merge
@@@ -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);
  
Simple merge