diff -up dokuwiki-2013-05-10a/inc/load.php.orig dokuwiki-2013-05-10a/inc/load.php
--- dokuwiki-2013-05-10a/inc/load.php.orig 2013-06-16 22:03:48.000000000 +0200
+++ dokuwiki-2013-05-10a/inc/load.php 2013-09-03 14:11:06.632296194 +0200
@@ -60,7 +60,7 @@ function load_autoload($name){
'cache_renderer' => DOKU_INC.'inc/cache.php',
'Doku_Event' => DOKU_INC.'inc/events.php',
'Doku_Event_Handler' => DOKU_INC.'inc/events.php',
- 'EmailAddressValidator' => DOKU_INC.'inc/EmailAddressValidator.php',
+ 'EmailAddressValidator' => '/usr/share/php/php-email-address-validation/EmailAddressValidator.php',
'Input' => DOKU_INC.'inc/Input.class.php',
'JpegMeta' => DOKU_INC.'inc/JpegMeta.php',
'SimplePie' => DOKU_INC.'inc/SimplePie.php',
@@ -69,7 +69,7 @@ function load_autoload($name){
'IXR_Client' => DOKU_INC.'inc/IXR_Library.php',
'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
- 'GeSHi' => DOKU_INC.'inc/geshi.php',
+ 'GeSHi' => '/usr/share/php/geshi.php',
'Tar' => DOKU_INC.'inc/Tar.class.php',
'TarLib' => DOKU_INC.'inc/TarLib.class.php',
'ZipLib' => DOKU_INC.'inc/ZipLib.class.php',
diff -up dokuwiki-2013-05-10a/inc/parserutils.php.orig dokuwiki-2013-05-10a/inc/parserutils.php
--- dokuwiki-2013-05-10a/inc/parserutils.php.orig 2013-06-16 22:03:48.000000000 +0200
+++ dokuwiki-2013-05-10a/inc/parserutils.php 2013-09-03 14:10:36.965839661 +0200
@@ -695,14 +695,14 @@ function p_xhtml_cached_geshi($code, $la
$cache = getCacheName($language.$code,".code");
$ctime = @filemtime($cache);
if($ctime && !$INPUT->bool('purge') &&
- $ctime > filemtime(DOKU_INC.'inc/geshi.php') && // geshi changed
- $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') && // language syntax definition changed
+ $ctime > filemtime('/usr/share/php/geshi.php') && // geshi changed
+ $ctime > @filemtime('/usr/share/php/geshi/'.$language.'.php') && // language syntax definition changed
$ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
$highlighted_code = io_readFile($cache, false);
} else {
- $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+ $geshi = new GeSHi($code, $language, '/usr/share/php/geshi');
$geshi->set_encoding('utf-8');
$geshi->enable_classes();
$geshi->set_header_type(GESHI_HEADER_PRE);