1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Author: Mohammed Adnène Trojette <adn+deb@diwi.org>
Description: Use packaged version of GeSHi instead of an embedded one (Closes: #513869).
diff -Naurp dokuwiki.orig/inc/parserutils.php dokuwiki/inc/parserutils.php
--- dokuwiki.orig/inc/parserutils.php
+++ dokuwiki/inc/parserutils.php
@@ -796,7 +796,7 @@ function p_xhtml_cached_geshi($code, $la
$ctime = @filemtime($cache);
if (
$ctime && !$INPUT->bool('purge') &&
- $ctime > filemtime(DOKU_INC . 'vendor/composer/installed.json') && // libraries changed
+ $ctime > filemtime('/usr/share/php-geshi/geshi.php') && // libraries changed
$ctime > filemtime(reset($config_cascade['main']['default']))
) { // dokuwiki changed
$highlighted_code = io_readFile($cache, false);
diff -Naurp dokuwiki.orig/vendor/composer/autoload_classmap.php dokuwiki/vendor/composer/autoload_classmap.php
--- dokuwiki.orig/vendor/composer/autoload_classmap.php
+++ dokuwiki/vendor/composer/autoload_classmap.php
@@ -15,7 +15,7 @@ return array(
'FeedImage' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/FeedImage.php',
'FeedItem' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/FeedItem.php',
'GPXCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/GPXCreator.php',
- 'GeSHi' => $vendorDir . '/geshi/geshi/src/geshi.php',
+ 'GeSHi' => '/usr/share/php-geshi/geshi.php',
'HTMLCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/HTMLCreator.php',
'HtmlDescribable' => $vendorDir . '/openpsa/universalfeedcreator/lib/Element/HtmlDescribable.php',
'JSCreator' => $vendorDir . '/openpsa/universalfeedcreator/lib/Creator/JSCreator.php',
diff -Naurp dokuwiki.orig/vendor/composer/autoload_static.php dokuwiki/vendor/composer/autoload_static.php
--- dokuwiki.orig/vendor/composer/autoload_static.php
+++ dokuwiki/vendor/composer/autoload_static.php
@@ -127,7 +127,7 @@ class ComposerStaticInita19a915ee98347a0
'FeedImage' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/FeedImage.php',
'FeedItem' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/FeedItem.php',
'GPXCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/GPXCreator.php',
- 'GeSHi' => __DIR__ . '/..' . '/geshi/geshi/src/geshi.php',
+ 'GeSHi' => '/usr/share/php-geshi/geshi.php',
'HTMLCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/HTMLCreator.php',
'HtmlDescribable' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Element/HtmlDescribable.php',
'JSCreator' => __DIR__ . '/..' . '/openpsa/universalfeedcreator/lib/Creator/JSCreator.php',
|
