Rediff patches for rpm 4.17

[packages/dokuwiki.git] / dokuwiki-geshi.patch

diff --git a/dokuwiki-geshi.patch b/dokuwiki-geshi.patch
index f981af989d9dc32fb58c0fdd3e3ac31f6d527b03..3c3e6da4d1a6f473250cfa3edb7310bda9498462 100644 (file)
--- a/dokuwiki-geshi.patch
+++ b/dokuwiki-geshi.patch
@@ -1,23 +1,11 @@
---- dokuwiki/inc/parserutils.php~      2009-11-10 15:25:28.000000000 +0200
-+++ dokuwiki/inc/parserutils.php       2009-11-10 15:26:29.134232633 +0200
-@@ -641,16 +641,16 @@
-     $cache = getCacheName($language.$code,".code");
-     $ctime = @filemtime($cache);
-     if($ctime && !$_REQUEST['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 {
- 
--        require_once(DOKU_INC . 'inc/geshi.php');
-+        require_once '/usr/share/php/geshi.php';
- 
--        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
-+        $geshi = new GeSHi($code, $language);
-         $geshi->set_encoding('utf-8');
-         $geshi->enable_classes();
-         $geshi->set_header_type(GESHI_HEADER_PRE);
+--- dokuwiki-2018-04-22a/vendor/composer/autoload_classmap.php~        2018-05-03 09:36:13.000000000 +0300
++++ dokuwiki-2018-04-22a/vendor/composer/autoload_classmap.php 2018-11-10 19:33:46.746455638 +0200
+@@ -14,7 +14,7 @@
+     '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.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',