Moved GeSHi location variable to config.default.php

diff --git a/data/config.default.php b/data/config.default.php
index bd41d0d88244e9fa34add198650e1b7b9f03cfca..8fb27a9dae7cc7cb68831c9afba455d2a5ba1e0f 100644 (file)
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -9,6 +9,7 @@ $GLOBALS['phorkie']['cfg'] = array(
     'topbar'        => '',
     'setupcheck'    => true,
     'elasticsearch' => null,
     'topbar'        => '',
     'setupcheck'    => true,
     'elasticsearch' => null,

+    'geshi'         => 'MediaWiki/geshi/geshi/geshi.php'

 );
 $GLOBALS['phorkie']['tools'] = array(
     '\\phorkie\\Tool_Xmllint' => true,
 );
 $GLOBALS['phorkie']['tools'] = array(
     '\\phorkie\\Tool_Xmllint' => true,

diff --git a/src/phorkie/Renderer/Geshi.php b/src/phorkie/Renderer/Geshi.php
index 1fc633eb7c739b86256900b621071a12ae1ae139..2010ead230760ea5dab72bdfc2c5b517ffedc1bd 100644 (file)
--- a/src/phorkie/Renderer/Geshi.php
+++ b/src/phorkie/Renderer/Geshi.php
@@ -17,7 +17,7 @@ class Renderer_Geshi
          * Yes, geshi needs to be in your include path
          * We use the mediawiki geshi extension package.
          */
          * Yes, geshi needs to be in your include path
          * We use the mediawiki geshi extension package.
          */

-        require_once 'MediaWiki/geshi/geshi/geshi.php';
+        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);
         $geshi = new \GeSHi($file->getContent(), $this->getType($file));
         $geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
         $geshi->set_header_type(GESHI_HEADER_DIV);