From: Christian Weiske <christian.weiske@netresearch.de>
Date: Fri, 13 Jun 2014 08:07:24 +0000 (+0200)
Subject: use geshi from geshi's new pear channel
X-Git-Tag: v0.4.0~28^2~3
X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/d80854dc9a670e0ee996cc89a59af2c5f8521205

use geshi from geshi's new pear channel
---

diff --git a/README.rst b/README.rst
index 1270c30..043c438 100644
--- a/README.rst
+++ b/README.rst
@@ -98,8 +98,8 @@ on your machine:
   $ pear channel-discover pear.twig-project.org
   $ pear install twig/Twig
 
-  $ pear channel-discover mediawiki.googlecode.com/svn
-  $ pear install mediawiki/geshi
+  $ pear channel-discover pear.geshi.org
+  $ pear install geshi/geshi
 
   $ pear channel-discover zustellzentrum.cweiske.de
   $ pear install zz/mime_type_plaindetect-alpha
@@ -110,11 +110,6 @@ on your machine:
   $ pear channel-discover pear2.php.net
   $ pear install pear2/pear2_services_linkback-alpha
 
-Note that this version of GeSHi is a bit outdated, but it's the fastest
-way to install it.
-If you install it manually be sure to update the
-path from ``data/config.default.php``.
-
 
 ======
 Search
diff --git a/data/config.default.php b/data/config.default.php
index 8f796f4..2beb354 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -12,7 +12,6 @@ $GLOBALS['phorkie']['cfg'] = array(
     'topbar'        => '',
     'setupcheck'    => true,
     'elasticsearch' => null,
-    'geshi'         => 'MediaWiki/geshi/geshi/geshi.php',
     'index'         => 'new',//"new" or "list"
     'perPage'       => 10,
     'defaultListPage' => 'last',//a number or "last"
diff --git a/src/phorkie/Renderer/Geshi.php b/src/phorkie/Renderer/Geshi.php
index 08c6c74..9cb15a2 100644
--- a/src/phorkie/Renderer/Geshi.php
+++ b/src/phorkie/Renderer/Geshi.php
@@ -13,12 +13,8 @@ class Renderer_Geshi
      */
     public function toHtml(File $file, Tool_Result $res = null)
     {
-        /**
-         * Yes, geshi needs to be in your include path
-         * We use the mediawiki geshi extension package.
-         */
         if (!class_exists('\\GeSHi', true)) {
-            require_once $GLOBALS['phorkie']['cfg']['geshi'];
+            require_once 'geshi.php';
         }
         $geshi = new \GeSHi($file->getContent(), $this->getType($file));
         $geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index 53e4fd0..fbc99c7 100644
--- a/src/phorkie/SetupCheck.php
+++ b/src/phorkie/SetupCheck.php
@@ -47,11 +47,9 @@ class SetupCheck
         }
 
         if (!class_exists('GeSHi', true)) {
-            $geshi = stream_resolve_include_path(
-                $GLOBALS['phorkie']['cfg']['geshi']
-            );
-            if ($geshi === false) {
-                $this->fail('GeSHi not available');
+            @include_once 'geshi.php';
+            if (!class_exists('GeSHi', false)) {
+                $this->fail('PEAR package not installed: pear.geshi.org/geshi');
             }
         }