X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/50e1018ba0749becdc3e05e9438176a475b70fed..94b076f028c2a12f522887caf02b6289957cf4fe:/src/phorkie/SetupCheck.php

diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index 62bbf19..fbc99c7 100644
--- a/src/phorkie/SetupCheck.php
+++ b/src/phorkie/SetupCheck.php
@@ -47,17 +47,18 @@ 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');
             }
         }
 
-        $markdown = stream_resolve_include_path('markdown.php');
-        if ($markdown === false) {
-            $this->fail('Markdown renderer not available');
+        if (!class_exists('\\Michelf\\Markdown', true)) {
+            //PEAR-installed version 1.0.2 has a different API
+            $markdown = stream_resolve_include_path('markdown.php');
+            if ($markdown === false) {
+                $this->fail('Markdown renderer not available');
+            }
         }
     }